summaryrefslogtreecommitdiff
path: root/admin/gitmerge.el
Commit message (Expand)AuthorAgeFilesLines
* ; Add 2023 to copyright years.Eli Zaretskii2023-01-011-1/+1
* * admin/gitmerge.el (gitmerge): Use substitute-command-keys.Stefan Kangas2022-09-211-6/+12
* Bind 'n'/'p' in gitmerge-mode to line scrollStefan Kangas2022-09-211-5/+8
* Make point-at-eol and point-at-bol obsoleteStefan Kangas2022-08-231-3/+3
* Adjust better to Autoconf quoting style changePaul Eggert2022-07-051-1/+1
* Merge from origin/emacs-28Eli Zaretskii2022-01-011-1/+1
|\
| * ; Add 2022 to copyright years.Eli Zaretskii2022-01-011-1/+1
* | Prefer locate-user-emacs-file in gitmerge.elStefan Kangas2021-11-231-2/+1
* | Revert "* admin/gitmerge.el (gitmerge-mode-map): Convert to defvar-keymap."Stefan Kangas2021-11-211-7/+10
* | * admin/gitmerge.el (gitmerge-mode-map): Convert to defvar-keymap.Stefan Kangas2021-11-171-10/+7
* | ; * admin/gitmerge.el: Fix typos.Stefan Kangas2021-11-111-5/+5
* | Fix encoding issues in gitmerge.el, make it work on MS-WindowsEli Zaretskii2021-11-031-25/+58
|/
* ; Minor license statement fixesStefan Kangas2021-02-081-0/+2
* * admin/*.el: Use lexical-bindingStefan Monnier2021-01-311-3/+3
* Update copyright year to 2021Paul Eggert2021-01-011-1/+1
* * admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS conflicts.Glenn Morris2020-07-291-1/+1
* Merge from origin/emacs-27Paul Eggert2020-01-011-1/+1
|\
| * Update copyright year to 2020Paul Eggert2020-01-011-1/+1
* | * admin/gitmerge.el (gitmerge-skip-regexp): Be more restrictive.Glenn Morris2019-12-301-1/+1
|/
* Merge diff-font-lock-refine and diff-auto-refine-mode into diff-refineCharles A. Roelli2019-03-031-1/+1
* Merge from origin/emacs-26Paul Eggert2018-12-311-1/+1
|\
| * Update copyright year to 2019Paul Eggert2019-01-011-1/+1
* | * admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.Glenn Morris2018-12-101-1/+1
* | * admin/gitmerge.el (gitmerge-resolve): Check NEWS patch exit status.Glenn Morris2018-10-241-9/+18
* | Stop assuming .git is a directory in gitmerge.elNoam Postavsky2018-06-181-2/+6
* | 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-011-1/+1
|\ \ | |/
| * Update copyright year to 2018Paul Eggert2018-01-011-1/+1
* | 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
* | 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
* | * 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
* | 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
* | emacs-25 → emacs-26Paul Eggert2017-09-251-1/+1
|/
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-131-1/+1
* Amend gitmerge to recognize the injunction "don't merge".Alan Mackenzie2017-03-291-1/+1
* Revert "Replace ldefs-boot with a much smaller file"Phillip Lord2017-03-071-1/+1
* Merge from origin/emacs-25Paul Eggert2017-01-011-1/+1
|\
| * Update copyright year to 2017Paul Eggert2016-12-311-1/+1
| * gitmerge: Add cherry pick to gitmerge-skip-regexpDavid Engster2016-10-061-2/+4
* | Replace ldefs-boot with a much smaller filePhillip Lord2016-12-131-1/+1
* | gitmerge: Add cherry pick to gitmerge-skip-regexpDavid Engster2016-05-011-2/+2
* | Compute a better commit message for mergesPaul Eggert2016-03-221-7/+5
View Lorry Controller Status