aboutsummaryrefslogtreecommitdiffstats
path: root/admin/gitmerge.el (unfollow)
Commit message (Expand)AuthorFilesLines
2020-01-01Update copyright year to 2020Paul Eggert1-1/+1
2019-12-30* admin/gitmerge.el (gitmerge-skip-regexp): Be more restrictive.Glenn Morris1-1/+1
2019-03-03Merge diff-font-lock-refine and diff-auto-refine-mode into diff-refineCharles A. Roelli1-1/+1
2019-01-01Update copyright year to 2019Paul Eggert1-1/+1
2018-12-10* admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.Glenn Morris1-1/+1
2018-10-24* admin/gitmerge.el (gitmerge-resolve): Check NEWS patch exit status.Glenn Morris1-9/+18
2018-06-18Stop assuming .git is a directory in gitmerge.elNoam Postavsky1-2/+6
2018-01-15Small improvement for noninteractive gitmergeGlenn Morris1-2/+7
2018-01-15Small gitmerge-skip-regexp fixGlenn Morris1-1/+1
2018-01-01Update copyright year to 2018Paul Eggert1-1/+1
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-11* admin/gitmerge.el (gitmerge-resolve): Disable buggy NEWS handling.Glenn Morris1-1/+5
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-08* admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.Glenn Morris1-1/+1
2017-09-25emacs-25 → emacs-26Paul Eggert1-1/+1
2017-09-13Prefer HTTPS to FTP and HTTP in documentationPaul Eggert1-1/+1
2017-03-29Amend gitmerge to recognize the injunction "don't merge".Alan Mackenzie1-1/+1
2017-03-07Revert "Replace ldefs-boot with a much smaller file"Phillip Lord1-1/+1
2016-12-31Update copyright year to 2017Paul Eggert1-1/+1
2016-12-13Replace ldefs-boot with a much smaller filePhillip Lord1-1/+1
2016-10-06gitmerge: Add cherry pick to gitmerge-skip-regexpDavid Engster1-2/+4
2016-05-01gitmerge: Add cherry pick to gitmerge-skip-regexpDavid Engster1-2/+2
2016-03-22Compute a better commit message for mergesPaul Eggert1-7/+5
2016-03-22* admin/gitmerge.el (gitmerge-skip-regexp): Add "no need to merge".Paul Eggert1-1/+1
2016-03-22Change do-not-merge pattern to "do not merge"Paul Eggert1-4/+5
2016-03-22Keep "merge" commits by default in gitmergePaul Eggert1-1/+1
2016-01-01Update copyright year to 2016Paul Eggert1-1/+1
2015-12-25* admin/gitmerge.el: Tweaks that seemed necessaryStefan Monnier1-2/+10
2015-11-14gitmerge: Fix git log commandDavid Engster1-3/+3
2015-11-14gitmerge: Try to detect cherry-picksDavid Engster1-3/+3
2015-06-10Improve generated ChangeLog for gitmerge.el commits. (Bug#20717)Glenn Morris1-1/+4
2015-06-05* admin/gitmerge.el (gitmerge-commit-message):Glenn Morris1-1/+1
2015-06-01* admin/gitmerge.el (gitmerge-commit-message):Glenn Morris1-1/+2
2015-01-01Update copyright year to 2015Paul Eggert1-1/+1
2014-11-28Spelling fix.Paul Eggert1-4/+4
2014-11-27admin: Add gitmerge.elDavid Engster1-0/+528
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-14 13:40:41 +0000