summaryrefslogtreecommitdiff
path: root/admin/gitmerge.el
Commit message (Expand)AuthorAge
* Update copyright year to 2019Paul Eggert2019-01-01
* Update copyright year to 2018Paul Eggert2018-01-01
* * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.Glenn Morris2017-11-08
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-13
* Amend gitmerge to recognize the injunction "don't merge".Alan Mackenzie2017-03-29
* Revert "Replace ldefs-boot with a much smaller file"Phillip Lord2017-03-07
* Merge from origin/emacs-25Paul Eggert2017-01-01
|\
| * Update copyright year to 2017Paul Eggert2016-12-31
| * gitmerge: Add cherry pick to gitmerge-skip-regexpDavid Engster2016-10-06
* | Replace ldefs-boot with a much smaller filePhillip Lord2016-12-13
* | gitmerge: Add cherry pick to gitmerge-skip-regexpDavid Engster2016-05-01
* | Compute a better commit message for mergesPaul Eggert2016-03-22
* | * admin/gitmerge.el (gitmerge-skip-regexp): Add "no need to merge".Paul Eggert2016-03-22
* | Change do-not-merge pattern to "do not merge"Paul Eggert2016-03-22
* | Keep "merge" commits by default in gitmergePaul Eggert2016-03-22
* | Merge from origin/emacs-25John Wiegley2016-01-11
|\|
| * Update copyright year to 2016Paul Eggert2016-01-01
* | * admin/gitmerge.el: Tweaks that seemed necessaryStefan Monnier2015-12-25
* | gitmerge: Fix git log commandDavid Engster2015-11-14
* | gitmerge: Try to detect cherry-picksDavid Engster2015-11-14
|/
* Improve generated ChangeLog for gitmerge.el commits. (Bug#20717)Glenn Morris2015-06-10
* * admin/gitmerge.el (gitmerge-commit-message):Glenn Morris2015-06-05
* * admin/gitmerge.el (gitmerge-commit-message):Glenn Morris2015-06-01
* Update copyright year to 2015Paul Eggert2015-01-01
* Merge from emacs-24Stefan Monnier2014-12-05
* Spelling fix.Paul Eggert2014-11-28
* admin: Add gitmerge.elDavid Engster2014-11-27
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 05:39:17 +0000