summaryrefslogtreecommitdiff
path: root/admin
AgeCommit message (Expand)Author
2018-03-23Ensure configure is running if necessaryPhillip Lord
2018-03-23Make update_autogen work in git worktreesRobert Pluim
2018-03-01* admin/automerge: Quieten initial reset.Glenn Morris
2018-02-28Quieten cedet "might not be defined at runtime" compile warningsGlenn Morris
2018-02-23* admin/automerge: Quieten initial pull if start with reset.Glenn Morris
2018-02-21* admin/automerge (merge): Report no. of commits if too few.Glenn Morris
2018-02-21* admin/automerge: Speed up check phase.Glenn Morris
2018-02-17Merge from origin/emacs-26Glenn Morris
2018-02-16; Fix doc typos related to indefinite articlesGlenn Morris
2018-01-31automerge: adjust meaning of -d optionGlenn Morris
2018-01-31automerge: add option to work in specific directoryGlenn Morris
2018-01-31automerge: add option to start with a resetGlenn Morris
2018-01-30automerge: handle upstream changes during operationGlenn Morris
2018-01-24* admin/automerge: Disable rebasing.Glenn Morris
2018-01-18* admin/automerge: New script.Glenn Morris
2018-01-18Merge from origin/emacs-26Glenn Morris
2018-01-16* admin/authors.el (authors-aliases): Tighten more entries.Glenn Morris
2018-01-16authors-aliases is based on regexps, not literalsGlenn Morris
2018-01-15Merge from origin/emacs-26Glenn Morris
2018-01-15Merge from origin/emacs-26Glenn Morris
2018-01-15* admin/authors.el (authors-aliases): Additions.Nicolas Petton
2018-01-15Update authors.elNicolas Petton
2018-01-15Small improvement for noninteractive gitmergeGlenn Morris
2018-01-15Small gitmerge-skip-regexp fixGlenn Morris
2018-01-13Fix an entry in authors-aliasesNicolas Petton
2018-01-12Update authorsNicolas Petton
2018-01-01Merge from origin/emacs-26Paul Eggert
2018-01-01Update copyright year to 2018Paul Eggert
2017-12-20Merge from origin/emacs-26Glenn Morris
2017-12-20; Replace non-ascii quote characters in doc strings etcGlenn Morris
2017-12-18Set minimum number of commits for gitmerge in batch modeGlenn Morris
2017-12-18* admin/gitmerge.el (gitmerge-skip-regexp): Be stricter in batch mode.Glenn Morris
2017-12-18Make gitmerge usable in batch modeGlenn Morris
2017-12-12* admin/gitmerge.el (gitmerge-missing):Glenn Morris
2017-12-12Merge from origin/emacs-26Glenn Morris
2017-12-12Fix gitmerge handling of automatic conflict reslutionGlenn Morris
2017-12-12Import the latest IVD_Sequences.txtEli Zaretskii
2017-12-11* admin/gitmerge.el (gitmerge-resolve): Disable buggy NEWS handling.Glenn Morris
2017-12-09Work around reader limitations for old-style backquotes.Philipp Stephani
2017-12-01* admin/gitmerge.el (gitmerge-resolve): Handle NEWS. (Bug#29366)Glenn Morris
2017-12-01Don't hard-code gitmerge.el's default merge branchGlenn Morris
2017-12-01* admin/gitmerge.el (gitmerge-resolve):Glenn Morris
2017-11-30Add date to dependency and source zips for snapshotsPhillip Lord
2017-11-27Update Build files for Emacs-27Phillip Lord
2017-11-25Merge from origin/emacs-26Paul Eggert
2017-11-25maint: shorten https://lists.gnu.org/archive/html/... linksPaul Eggert
2017-11-20Fix lower case installer namePhillip Lord
2017-11-20Add date to snapshot filePhillip Lord
2017-11-17Rebrand UninstallerPhillip Lord
2017-11-17Fix install location for windows installerPhillip Lord