aboutsummaryrefslogtreecommitdiffstats
path: root/admin (unfollow)
Commit message (Expand)AuthorFilesLines
2018-02-28Quieten cedet "might not be defined at runtime" compile warningsGlenn Morris1-0/+5
2018-02-23* admin/automerge: Quieten initial pull if start with reset.Glenn Morris1-1/+1
2018-02-21* admin/automerge (merge): Report no. of commits if too few.Glenn Morris1-3/+1
2018-02-21* admin/automerge: Speed up check phase.Glenn Morris1-1/+2
2018-02-16; Fix doc typos related to indefinite articlesGlenn Morris2-3/+3
2018-01-31automerge: adjust meaning of -d optionGlenn Morris1-11/+9
2018-01-31automerge: add option to work in specific directoryGlenn Morris1-9/+23
2018-01-31automerge: add option to start with a resetGlenn Morris1-5/+17
2018-01-30automerge: handle upstream changes during operationGlenn Morris1-22/+53
2018-01-24* admin/automerge: Disable rebasing.Glenn Morris1-3/+6
2018-01-18* admin/automerge: New script.Glenn Morris1-0/+196
2018-01-16* admin/authors.el (authors-aliases): Tighten more entries.Glenn Morris1-3/+3
2018-01-16authors-aliases is based on regexps, not literalsGlenn Morris1-9/+9
2018-01-15* admin/authors.el (authors-aliases): Additions.Nicolas Petton1-0/+18
2018-01-15Update authors.elNicolas Petton1-1/+15
2018-01-15Small improvement for noninteractive gitmergeGlenn Morris1-2/+7
2018-01-15Small gitmerge-skip-regexp fixGlenn Morris1-1/+1
2018-01-13Fix an entry in authors-aliasesNicolas Petton1-1/+1
2018-01-12Update authorsNicolas Petton1-1/+3
2018-01-01Update copyright year to 2018Paul Eggert44-44/+44
2017-12-20; Replace non-ascii quote characters in doc strings etcGlenn Morris1-12/+12
2017-12-18Set minimum number of commits for gitmerge in batch modeGlenn Morris1-0/+9
2017-12-18* admin/gitmerge.el (gitmerge-skip-regexp): Be stricter in batch mode.Glenn Morris1-2/+10
2017-12-18Make gitmerge usable in batch modeGlenn Morris1-4/+11
2017-12-12* admin/gitmerge.el (gitmerge-missing):Glenn Morris1-0/+1
2017-12-12Fix gitmerge handling of automatic conflict reslutionGlenn Morris1-11/+12
2017-12-12Import the latest IVD_Sequences.txtEli Zaretskii1-1/+720
2017-12-11* admin/gitmerge.el (gitmerge-resolve): Disable buggy NEWS handling.Glenn Morris1-1/+5
2017-12-09Work around reader limitations for old-style backquotes.Philipp Stephani1-7/+12
2017-12-01* admin/gitmerge.el (gitmerge-resolve): Handle NEWS. (Bug#29366)Glenn Morris1-19/+41
2017-12-01Don't hard-code gitmerge.el's default merge branchGlenn Morris1-3/+19
2017-12-01* admin/gitmerge.el (gitmerge-resolve):Glenn Morris1-2/+4
2017-11-30Add date to dependency and source zips for snapshotsPhillip Lord2-17/+42
2017-11-27Update Build files for Emacs-27Phillip Lord3-6/+7
2017-11-25maint: shorten https://lists.gnu.org/archive/html/... linksPaul Eggert10-28/+28
2017-11-20Fix lower case installer namePhillip Lord1-3/+1
2017-11-20Add date to snapshot filePhillip Lord2-11/+25
2017-11-17Rebrand UninstallerPhillip Lord1-1/+1
2017-11-17Fix install location for windows installerPhillip Lord2-6/+26
2017-11-15Rebrand Windows installerPhillip Lord1-0/+1
2017-11-13Simplify by removing HAVE_STRUCT_ATTRIBUTE_ALIGNEDPaul Eggert1-1/+0
2017-11-08* admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.Glenn Morris1-1/+1
2017-11-05Add support for Windows installer buildPhillip Lord2-11/+114
2017-11-03; * CONTRIBUTE, admin/make-tarball.txt: Doc tweaks re 'emacs-announce'.Glenn Morris1-0/+5
2017-11-02Simplify by assuming !_MSC_VER.Paul Eggert1-1/+0
2017-11-01; Spelling fixesPaul Eggert2-6/+6
2017-10-27Fix some duplicate words typosGlenn Morris1-1/+1
2017-10-25Update documentation for windows buildPhillip Lord1-0/+92
2017-10-25Fix Bug#28982Michael Albinus1-0/+1
2017-10-25Fix windows build errorsPhillip Lord1-5/+7