summaryrefslogtreecommitdiff
path: root/admin/gitmerge.el
Commit message (Expand)AuthorAge
* ; Minor license statement fixesStefan Kangas2021-02-08
* * admin/*.el: Use lexical-bindingStefan Monnier2021-01-31
* Update copyright year to 2021Paul Eggert2021-01-01
* * admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS conflicts.Glenn Morris2020-07-29
* Merge from origin/emacs-27Paul Eggert2020-01-01
|\
| * Update copyright year to 2020Paul Eggert2020-01-01
* | * admin/gitmerge.el (gitmerge-skip-regexp): Be more restrictive.Glenn Morris2019-12-30
|/
* Merge diff-font-lock-refine and diff-auto-refine-mode into diff-refineCharles A. Roelli2019-03-03
* Merge from origin/emacs-26Paul Eggert2018-12-31
|\
| * Update copyright year to 2019Paul Eggert2019-01-01
* | * admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.Glenn Morris2018-12-10
* | * admin/gitmerge.el (gitmerge-resolve): Check NEWS patch exit status.Glenn Morris2018-10-24
* | Stop assuming .git is a directory in gitmerge.elNoam Postavsky2018-06-18
* | Small improvement for noninteractive gitmergeGlenn Morris2018-01-15
* | Small gitmerge-skip-regexp fixGlenn Morris2018-01-15
* | Merge from origin/emacs-26Paul Eggert2018-01-01
|\|
| * Update copyright year to 2018Paul Eggert2018-01-01
* | Set minimum number of commits for gitmerge in batch modeGlenn Morris2017-12-18
* | * admin/gitmerge.el (gitmerge-skip-regexp): Be stricter in batch mode.Glenn Morris2017-12-18
* | Make gitmerge usable in batch modeGlenn Morris2017-12-18
* | * admin/gitmerge.el (gitmerge-missing):Glenn Morris2017-12-12
* | Fix gitmerge handling of automatic conflict reslutionGlenn Morris2017-12-12
* | * admin/gitmerge.el (gitmerge-resolve): Disable buggy NEWS handling.Glenn Morris2017-12-11
* | * admin/gitmerge.el (gitmerge-resolve): Handle NEWS. (Bug#29366)Glenn Morris2017-12-01
* | Don't hard-code gitmerge.el's default merge branchGlenn Morris2017-12-01
* | * admin/gitmerge.el (gitmerge-resolve):Glenn Morris2017-12-01
* | Merge from origin/emacs-26Paul Eggert2017-11-08
|\|
| * * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.Glenn Morris2017-11-08
* | emacs-25 → emacs-26Paul Eggert2017-09-25
|/
* 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-29 09:34:58 +0000