aboutsummaryrefslogtreecommitdiffstats
path: root/admin/gitmerge.el (unfollow)
Commit message (Expand)AuthorFilesLines
2026-01-01; Add 2026 to copyright years.Sean Whitton1-1/+1
2025-07-01Revert "admin/gitmerge.el (gitmerge-resolve): Use `replace-region-contents`"Stefan Monnier1-2/+6
2025-06-30admin/gitmerge.el (gitmerge-resolve): Use `replace-region-contents`Stefan Monnier1-6/+2
2025-02-21Prefer defvar-keymap in admin/gitmerge.elStefan Kangas1-12/+10
2025-01-02Update copyright year to 2025Stefan Kangas1-1/+1
2025-01-01Update copyright year to 2025Paul Eggert1-1/+1
2024-02-05(gitmerge-mode-font-lock-keywords): Don't use font-lock-*-face varsStefan Monnier1-4/+4
2024-01-02; Add 2024 to copyright yearsPo Lu1-1/+1
2023-01-01; Add 2023 to copyright years.Eli Zaretskii1-1/+1
2022-12-29; Fix byte-compilation warnings in admin/*.elMattias Engdegård1-1/+1
2022-09-21* admin/gitmerge.el (gitmerge): Use substitute-command-keys.Stefan Kangas1-6/+12
2022-09-21Bind 'n'/'p' in gitmerge-mode to line scrollStefan Kangas1-5/+8
2022-08-23Make point-at-eol and point-at-bol obsoleteStefan Kangas1-3/+3
2022-07-05Adjust better to Autoconf quoting style changePaul Eggert1-1/+1
2022-01-01; Add 2022 to copyright years.Eli Zaretskii1-1/+1
2021-11-23Prefer locate-user-emacs-file in gitmerge.elStefan Kangas1-2/+1
2021-11-21Revert "* admin/gitmerge.el (gitmerge-mode-map): Convert to defvar-keymap."Stefan Kangas1-7/+10
2021-11-17* admin/gitmerge.el (gitmerge-mode-map): Convert to defvar-keymap.Stefan Kangas1-10/+7
2021-11-11; * admin/gitmerge.el: Fix typos.Stefan Kangas1-5/+5
2021-11-03Fix encoding issues in gitmerge.el, make it work on MS-WindowsEli Zaretskii1-25/+58
2021-02-08; Minor license statement fixesStefan Kangas1-0/+2
2021-01-31* admin/*.el: Use lexical-bindingStefan Monnier1-3/+3
2021-01-31; emacs-26 → emacs-27Stefan Kangas1-1/+1
2021-01-01Update copyright year to 2021Paul Eggert1-1/+1
2021-01-01Update copyright year to 2021Paul Eggert1-1/+1
2020-07-29* admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS conflicts.Glenn Morris1-1/+1
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
generated by cgit v1.2.1 (git 2.18.0) at 2026-04-23 18:18:45 +0000