summaryrefslogtreecommitdiff
path: root/admin/gitmerge.el
AgeCommit message (Expand)Author
2022-01-01Merge from origin/emacs-28Eli Zaretskii
2022-01-01; Add 2022 to copyright years.Eli Zaretskii
2021-11-23Prefer locate-user-emacs-file in gitmerge.elStefan Kangas
2021-11-21Revert "* admin/gitmerge.el (gitmerge-mode-map): Convert to defvar-keymap."Stefan Kangas
2021-11-17* admin/gitmerge.el (gitmerge-mode-map): Convert to defvar-keymap.Stefan Kangas
2021-11-11; * admin/gitmerge.el: Fix typos.Stefan Kangas
2021-11-03Fix encoding issues in gitmerge.el, make it work on MS-WindowsEli Zaretskii
2021-02-08; Minor license statement fixesStefan Kangas
2021-01-31* admin/*.el: Use lexical-bindingStefan Monnier
2021-01-01Update copyright year to 2021Paul Eggert
2020-07-29* admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS conflicts.Glenn Morris
2020-01-01Merge from origin/emacs-27Paul Eggert
2020-01-01Update copyright year to 2020Paul Eggert
2019-12-30* admin/gitmerge.el (gitmerge-skip-regexp): Be more restrictive.Glenn Morris
2019-03-03Merge diff-font-lock-refine and diff-auto-refine-mode into diff-refineCharles A. Roelli
2018-12-31Merge from origin/emacs-26Paul Eggert
2019-01-01Update copyright year to 2019Paul Eggert
2018-12-10* admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.Glenn Morris
2018-10-24* admin/gitmerge.el (gitmerge-resolve): Check NEWS patch exit status.Glenn Morris
2018-06-18Stop assuming .git is a directory in gitmerge.elNoam Postavsky
2018-01-15Small improvement for noninteractive gitmergeGlenn Morris
2018-01-15Small gitmerge-skip-regexp fixGlenn Morris
2018-01-01Merge from origin/emacs-26Paul Eggert
2018-01-01Update copyright year to 2018Paul Eggert
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-12Fix gitmerge handling of automatic conflict reslutionGlenn Morris
2017-12-11* admin/gitmerge.el (gitmerge-resolve): Disable buggy NEWS handling.Glenn Morris
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-08Merge from origin/emacs-26Paul Eggert
2017-11-08* admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.Glenn Morris
2017-09-25emacs-25 → emacs-26Paul Eggert
2017-09-13Prefer HTTPS to FTP and HTTP in documentationPaul Eggert
2017-03-29Amend gitmerge to recognize the injunction "don't merge".Alan Mackenzie
2017-03-07Revert "Replace ldefs-boot with a much smaller file"Phillip Lord
2017-01-01Merge from origin/emacs-25Paul Eggert
2016-12-31Update copyright year to 2017Paul Eggert
2016-12-13Replace ldefs-boot with a much smaller filePhillip Lord
2016-10-06gitmerge: Add cherry pick to gitmerge-skip-regexpDavid Engster
2016-05-01gitmerge: Add cherry pick to gitmerge-skip-regexpDavid Engster
2016-03-22Compute a better commit message for mergesPaul Eggert
2016-03-22* admin/gitmerge.el (gitmerge-skip-regexp): Add "no need to merge".Paul Eggert
2016-03-22Change do-not-merge pattern to "do not merge"Paul Eggert
2016-03-22Keep "merge" commits by default in gitmergePaul Eggert
2016-01-11Merge from origin/emacs-25John Wiegley
2016-01-01Update copyright year to 2016Paul Eggert
generated by cgit v1.3 (git 2.53.0) at 2026-07-10 04:40:52 +0000