summaryrefslogtreecommitdiff
path: root/admin
Commit message (Expand)AuthorAgeFilesLines
* automerge: adjust meaning of -d optionGlenn Morris2018-01-311-11/+9
* automerge: add option to work in specific directoryGlenn Morris2018-01-311-9/+23
* automerge: add option to start with a resetGlenn Morris2018-01-311-5/+17
* automerge: handle upstream changes during operationGlenn Morris2018-01-301-22/+53
* * admin/automerge: Disable rebasing.Glenn Morris2018-01-241-3/+6
* * admin/automerge: New script.Glenn Morris2018-01-181-0/+196
* Merge from origin/emacs-26Glenn Morris2018-01-181-12/+12
|\
| * * admin/authors.el (authors-aliases): Tighten more entries.Glenn Morris2018-01-161-3/+3
| * authors-aliases is based on regexps, not literalsGlenn Morris2018-01-161-9/+9
* | Merge from origin/emacs-26Glenn Morris2018-01-151-1/+1
|\ \ | |/
| * Fix an entry in authors-aliasesNicolas Petton2018-01-131-1/+1
* | Merge from origin/emacs-26Glenn Morris2018-01-151-1/+3
|\ \ | |/
| * Update authorsNicolas Petton2018-01-121-1/+3
* | * admin/authors.el (authors-aliases): Additions.Nicolas Petton2018-01-151-0/+18
* | Update authors.elNicolas Petton2018-01-151-1/+15
* | Small improvement for noninteractive gitmergeGlenn Morris2018-01-151-2/+7
* | Small gitmerge-skip-regexp fixGlenn Morris2018-01-151-1/+1
* | Merge from origin/emacs-26Paul Eggert2018-01-0144-44/+44
|\ \ | |/
| * Update copyright year to 2018Paul Eggert2018-01-0144-44/+44
* | Merge from origin/emacs-26Glenn Morris2017-12-201-12/+12
|\ \ | |/
| * ; Replace non-ascii quote characters in doc strings etcGlenn Morris2017-12-201-12/+12
* | Set minimum number of commits for gitmerge in batch modeGlenn Morris2017-12-181-0/+9
* | * admin/gitmerge.el (gitmerge-skip-regexp): Be stricter in batch mode.Glenn Morris2017-12-181-2/+10
* | Make gitmerge usable in batch modeGlenn Morris2017-12-181-4/+11
* | * admin/gitmerge.el (gitmerge-missing):Glenn Morris2017-12-121-0/+1
* | Merge from origin/emacs-26Glenn Morris2017-12-121-1/+720
|\ \ | |/
| * Import the latest IVD_Sequences.txtEli Zaretskii2017-12-121-1/+720
* | Fix gitmerge handling of automatic conflict reslutionGlenn Morris2017-12-121-11/+12
* | * admin/gitmerge.el (gitmerge-resolve): Disable buggy NEWS handling.Glenn Morris2017-12-111-1/+5
* | Work around reader limitations for old-style backquotes.Philipp Stephani2017-12-091-7/+12
* | * admin/gitmerge.el (gitmerge-resolve): Handle NEWS. (Bug#29366)Glenn Morris2017-12-011-19/+41
* | Don't hard-code gitmerge.el's default merge branchGlenn Morris2017-12-011-3/+19
* | * admin/gitmerge.el (gitmerge-resolve):Glenn Morris2017-12-011-2/+4
* | Add date to dependency and source zips for snapshotsPhillip Lord2017-11-302-17/+42
* | Update Build files for Emacs-27Phillip Lord2017-11-273-6/+7
* | Merge from origin/emacs-26Paul Eggert2017-11-2510-28/+28
|\ \ | |/
| * maint: shorten https://lists.gnu.org/archive/html/... linksPaul Eggert2017-11-2510-28/+28
* | Fix lower case installer namePhillip Lord2017-11-201-3/+1
* | Add date to snapshot filePhillip Lord2017-11-202-11/+25
* | Rebrand UninstallerPhillip Lord2017-11-171-1/+1
* | Fix install location for windows installerPhillip Lord2017-11-172-6/+26
* | Rebrand Windows installerPhillip Lord2017-11-151-0/+1
* | Merge from origin/emacs-26Paul Eggert2017-11-131-1/+0
|\ \ | |/
| * Simplify by removing HAVE_STRUCT_ATTRIBUTE_ALIGNEDPaul Eggert2017-11-131-1/+0
* | Merge from origin/emacs-26Paul Eggert2017-11-081-1/+1
|\ \ | |/
| * * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.Glenn Morris2017-11-081-1/+1
* | Merge from origin/emacs-26Paul Eggert2017-11-081-0/+5
|\ \ | |/
| * ; * CONTRIBUTE, admin/make-tarball.txt: Doc tweaks re 'emacs-announce'.Glenn Morris2017-11-031-0/+5
* | Add support for Windows installer buildPhillip Lord2017-11-052-11/+114
* | Simplify by assuming !_MSC_VER.Paul Eggert2017-11-021-1/+0
View Lorry Controller Status