summaryrefslogtreecommitdiff
path: root/admin/gitmerge.el
Commit message (Collapse)AuthorAge
* Merge from origin/emacs-29Eli Zaretskii2023-01-01
|\ | | | | | | | | | | | | | | | | | | | | cae528457c ; Add 2023 to copyright years. b394359261 Improve documentation of 'isearch-open-overlay-temporary' ab3210e709 Document 'use-package' in the 2 main manuals # Conflicts: # etc/refcards/ru-refcard.tex # lib/explicit_bzero.c # m4/explicit_bzero.m4
| * ; Add 2023 to copyright years.Eli Zaretskii2023-01-01
| |
* | ; Fix byte-compilation warnings in admin/*.elMattias Engdegård2022-12-29
|/
* * admin/gitmerge.el (gitmerge): Use substitute-command-keys.Stefan Kangas2022-09-21
|
* Bind 'n'/'p' in gitmerge-mode to line scrollStefan Kangas2022-09-21
| | | | | * admin/gitmerge.el (gitmerge-mode-map): Bind 'n' and 'p' to 'next-line' and 'previous-line'.
* Make point-at-eol and point-at-bol obsoleteStefan Kangas2022-08-23
| | | | | | | * lisp/subr.el (point-at-eol, point-at-bol): Make XEmacs compat aliases obsolete in favor of `pos-bol'/'line-beginning-position' or 'pos-eol'/'line-end-position'. Update callers. Ref: https://lists.gnu.org/r/emacs-devel/2022-08/msg00853.html
* Adjust better to Autoconf quoting style changePaul Eggert2022-07-05
| | | | | | | | | | | | | | * admin/gitmerge.el (gitmerge-emacs-version): * admin/nt/dist-build/build-zips.sh (ACTUAL_VERSION): * admin/quick-install-emacs (VERSION): * lisp/cedet/ede/emacs.el (ede-emacs-version): Adjust to change in configure.ac’s Autoconf quoting style. * etc/srecode/ede-autoconf.srt: * test/lisp/progmodes/autoconf-tests.el: (autoconf-tests-current-defun-function-define) (autoconf-tests-current-defun-function-subst): Use better Autoconf quoting. * make-dist (version): Simplify.
* Merge from origin/emacs-28Eli Zaretskii2022-01-01
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year. 86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year ebe8772f65 ; Minor fixes related to copyright years 23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye... 8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t. 19dcb237b5 ; Add 2022 to copyright years. # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex # lib/cdefs.h # lisp/erc/erc-dcc.el # lisp/erc/erc-imenu.el # lisp/erc/erc-replace.el # lisp/image-dired.el # lisp/progmodes/xref.el # m4/alloca.m4 # m4/byteswap.m4 # m4/errno_h.m4 # m4/getopt.m4 # m4/gnulib-common.m4 # m4/inttypes.m4 # m4/stddef_h.m4 # m4/stdint.m4 # m4/sys_socket_h.m4
| * ; Add 2022 to copyright years.Eli Zaretskii2022-01-01
| |
* | Prefer locate-user-emacs-file in gitmerge.elStefan Kangas2021-11-23
| | | | | | | | | | * admin/gitmerge.el (gitmerge-status-file): Prefer 'locate-user-emacs-file' to fiddling with 'user-emacs-directory'.
* | Revert "* admin/gitmerge.el (gitmerge-mode-map): Convert to defvar-keymap."Stefan Kangas2021-11-21
| | | | | | | | This reverts commit 4c467e4aff12e65fa4fa62d7f4bdcbf4a2bcd92c.
* | * admin/gitmerge.el (gitmerge-mode-map): Convert to defvar-keymap.Stefan Kangas2021-11-17
| |
* | ; * admin/gitmerge.el: Fix typos.Stefan Kangas2021-11-11
| |
* | Fix encoding issues in gitmerge.el, make it work on MS-WindowsEli Zaretskii2021-11-03
|/ | | | | | | | | | | | | * admin/gitmerge.el (gitmerge-emacs-version, gitmerge-show-log) (gitmerge-show-diff, gitmerge-show-files, gitmerge-missing) (gitmerge-setup-log-buffer, gitmerge-resolve) (gitmerge-commit-message, gitmerge-apply) (gitmerge-resolve-unmerged, gitmerge-repo-clean) (gitmerge-commit): Bind coding-system-for-read/write to the appropriate vc-git values. (gitmerge-apply) [windows-nt]: Pass long merge log messages via a temporary file. (gitmerge): Clarify the description of the "R" flag.
* ; Minor license statement fixesStefan Kangas2021-02-08
|
* * admin/*.el: Use lexical-bindingStefan Monnier2021-01-31
| | | | | | | | | | | | | * admin/admin.el: Use lexical-binding. (manual-misc-manuals): Pass a limit to `looking-back`. (reminder-for-release-blocking-bugs): Don't use `_` for a real variable. * admin/authors.el: Use lexical-binding. (authors-disambiguate-file-name): Remove unused var `parent`. * admin/cus-test.el: * admin/find-gc.el: * admin/gitmerge.el: Use lexical-binding.
* Update copyright year to 2021Paul Eggert2021-01-01
| | | | Run "TZ=UTC0 admin/update-copyright".
* * admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS conflicts.Glenn Morris2020-07-29
|
* Merge from origin/emacs-27Paul Eggert2020-01-01
|\ | | | | | | | | | | | | | | | | | | | | 186152ba40 Pacify gcc -Wunused-function on Ubuntu 18.04.3 4cd143aded Fix copyright years by hand 365e01cc9f Update copyright year to 2020 cd2c156163 ; * etc/NEWS: Make the description of XDG fallback more ac... # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex
| * Update copyright year to 2020Paul Eggert2020-01-01
| | | | | | | | Run "TZ=UTC0 admin/update-copyright $(git ls-files)".
* | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change was discussed in Bug#32991. * admin/gitmerge.el (gitmerge-resolve): Bind 'diff-refine' instead of 'diff-auto-refine-mode' to nil. * doc/emacs/files.texi (Diff Mode): Explain 'diff-refine' instead of 'diff-auto-refine-mode' in the documentation of 'diff-hunk-next' and 'diff-hunk-prev'. Mention in the documentation of 'diff-refine-hunk' that refining is already done by default. * etc/NEWS (Diff mode): Explain renamed 'diff-refine' variable and mention deprecation and disabling of 'diff-auto-refine-mode'. * lisp/vc/diff-mode.el (diff-font-lock-refine): Rename to 'diff-refine' and allow choices nil, 'font-lock' and 'navigation'. (diff-auto-refine-mode): Disable it by default, make it obsolete and make it set 'diff-refine' appropriately to keep backward compatibility. (diff-hunk-next, diff-hunk-prev): Adapt to rename of diff-auto-refine-mode and ensure that refining only happens when calling these commands interactively. (diff--font-lock-refined): Adapt to rename of diff-font-lock-refine. * lisp/vc/smerge-mode.el (smerge-next, smerge-prev): Check that 'diff-refine' is set instead of checking 'diff-auto-refine-mode' when deciding whether to refine a conflict.
* Merge from origin/emacs-26Paul Eggert2018-12-31
|\ | | | | | | | | | | 2fcf2df Fix copyright years by hand 26bed8b Update copyright year to 2019 2814292 Fix value of default frame height. (Bug#33921)
| * Update copyright year to 2019Paul Eggert2019-01-01
| | | | | | | | Run 'TZ=UTC0 admin/update-copyright $(git ls-files)'.
* | * 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
| | | | | | | | | | | | * admin/gitmerge.el (gitmerge-maybe-resume): Use 'git rev-parse --git-dir' to find the git directory rather than assuming it is .git/ (that assumption fails for separated worktrees).
* | Small improvement for noninteractive gitmergeGlenn Morris2018-01-15
| | | | | | | | | | * admin/gitmerge.el (gitmerge-resolve-unmerged): In batch mode, report conflicted files.
* | Small gitmerge-skip-regexp fixGlenn Morris2018-01-15
| | | | | | | | | | * admin/gitmerge.el (gitmerge-skip-regexp): Update for new format of "bump version" message that seems to have appeared.
* | Merge from origin/emacs-26Paul Eggert2018-01-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63b04c11d5 Fix copyright years by hand 5c7dd8a783 Update copyright year to 2018 220a9ecba1 Merge from Gnulib 312c565566 Don't add empty keyboard macro to macro ring (Bug#24992) 39ca289a7a Allow customization of decoding of "man" command f8240815ea * etc/NEWS: Add security consideration note on passphrase ... 0c78822c70 Fix subtle problem with scroll-down when scroll-margin is ... acd289c5a4 Fix problems with indexing in User manual b240c7846b * lisp/help.el (describe-key): Only (copy-sequence elt) wh... e879a5444a * src/buffer.c (Frestore_buffer_modified_p): Fix bug#29846 81b1028b63 Improve documentation of 'inhibit-modification-hooks' and ... 7175496d7a Fix doc string of 'enable-recursive-minibuffers' 5b38406491 Fix documentation of delsel and of killing text # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex
| * Update copyright year to 2018Paul Eggert2018-01-01
| | | | | | | | Run admin/update-copyright.
* | Set minimum number of commits for gitmerge in batch modeGlenn Morris2017-12-18
| | | | | | | | | | * admin/gitmerge.el (gitmerge-minimum-missing): New variable. (gitmerge): In batch mode, respect gitmerge-minimum-missing.
* | * 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): Add progress messages. (gitmerge-maybe-resume): In batch mode, never resume. (gitmerge): Handle batch mode.
* | * admin/gitmerge.el (gitmerge-missing):Glenn Morris2017-12-12
| | | | | | | | Don't get confused by decorations.
* | Fix gitmerge handling of automatic conflict reslutionGlenn Morris2017-12-12
| | | | | | | | | | | | | | * admin/gitmerge.el (gitmerge-resolve): Reenable NEWS handling. (gitmerge-resolve-unmerged): Commit after successful resolution. (gitmerge-commit): New function, extracted from gitmerge-maybe-resume. (gitmerge-maybe-resume): Use gitmerge-commit.
* | * 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-default-branch): Make it a variable, defaulting to nil. (gitmerge-emacs-version, gitmerge-default-branch): New functions. (gitmerge): Guess the branch to merge from.
* | * admin/gitmerge.el (gitmerge-resolve):Glenn Morris2017-12-01
| | | | | | | | Fix treatment of generated files.
* | Merge from origin/emacs-26Paul Eggert2017-11-08
|\| | | | | | | | | 6c3031399b * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc t... 98288ecaff Further workaround for faulty localtime() under macOS 10.6
| * * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.Glenn Morris2017-11-08
| |
* | emacs-25 → emacs-26Paul Eggert2017-09-25
|/ | | | * admin/gitmerge.el (gitmerge-default-branch): Now emacs-26.
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-13
| | | | | | | | | | | | | Most of this change is to boilerplate commentary such as license URLs. This change was prompted by ftp://ftp.gnu.org's going-away party, planned for November. Change these FTP URLs to https://ftp.gnu.org instead. Make similar changes for URLs to other organizations moving away from FTP. Also, change HTTP to HTTPS for URLs to gnu.org and fsf.org when this works, as this will further help defend against man-in-the-middle attacks (for this part I omitted the MS-DOS and MS-Windows sources and the test tarballs to keep the workload down). HTTPS is not fully working to lists.gnu.org so I left those URLs alone for now.
* Amend gitmerge to recognize the injunction "don't merge".Alan Mackenzie2017-03-29
| | | | | * admin/gitmerge.el (gitmerge-skip-regexp): amend regexp to match "don't" as well as "do not".
* Revert "Replace ldefs-boot with a much smaller file"Phillip Lord2017-03-07
| | | | | | | | | | | This reverts commit c27b645956a11fab1dd8fa189254d525390958f5. This commit has been reverted because the new mechanism was too sensitive to changes in the lisp source, generation of new ldefs-boot files was platform specific and resulted in warnings about undefined variables. See also 11436e2890d.
* Merge from origin/emacs-25Paul Eggert2017-01-01
|\ | | | | | | | | 2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017
| * Update copyright year to 2017Paul Eggert2016-12-31
| | | | | | | | Run admin/update-copyright.
| * gitmerge: Add cherry pick to gitmerge-skip-regexpDavid Engster2016-10-06
| | | | | | | | | | | | | | * gitmerge.el (gitmerge-skip-regexp): Add "cherry picked from commit", which is the string appended by 'git cherry-pick -x'. (cherry picked from commit f648e4866981b142fca788372e1fd9013a0bb16a)
* | Replace ldefs-boot with a much smaller filePhillip Lord2016-12-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Makefile.in (bootstrap-build,generate-ldefs-boot): New targets. (bootstrap): Depend on bootstrap-build. * admin/ldefs-clean.el: New file. * lisp/Makefile.in (compile-first): Depend on loaddefs.el * lisp/ldefs-boot.el: Remove. * lisp/ldefs-boot-auto.el: New file. * lisp/ldefs-boot-manual.el: New file. * lisp/loadup.el: Load ldefs-boot-manual.el. * src/emacs.c (generating_ldefs_boot): New variable. (main): Check whether we are generating ldefs. * src/eval.c (autoload-do-load): Dump autoload forms to stderr when requested. * src/lisp.h (generating_ldefs_boot): New variable. * admin/gitmerge.el, admin/make-tarball.txt, admin/notes/copyright, lisp/Makefile.in, lisp/cus-dep.el, lisp/emacs-lisp/elint.el, lisp/finder.el, lisp/loadup.el, msdos/mainmake.v2: Update reference to ldefs-boot. * admin/update_autogen: Alter mechanism for ldefs-boot generation.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 15:56:00 +0000