summaryrefslogtreecommitdiff
path: root/admin/gitmerge.el
Commit message (Collapse)AuthorAgeFilesLines
* Merge diff-font-lock-refine and diff-auto-refine-mode into diff-refineCharles A. Roelli2019-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-311-1/+1
|\ | | | | | | | | | | 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-011-1/+1
| | | | | | | | Run 'TZ=UTC0 admin/update-copyright $(git ls-files)'.
* | * 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
| | | | | | | | | | | | * 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-151-2/+7
| | | | | | | | | | * admin/gitmerge.el (gitmerge-resolve-unmerged): In batch mode, report conflicted files.
* | Small gitmerge-skip-regexp fixGlenn Morris2018-01-151-1/+1
| | | | | | | | | | * 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-011-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-011-1/+1
| | | | | | | | Run admin/update-copyright.
* | Set minimum number of commits for gitmerge in batch modeGlenn Morris2017-12-181-0/+9
| | | | | | | | | | * 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-181-2/+10
| |
* | Make gitmerge usable in batch modeGlenn Morris2017-12-181-4/+11
| | | | | | | | | | | | * 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-121-0/+1
| | | | | | | | Don't get confused by decorations.
* | Fix gitmerge handling of automatic conflict reslutionGlenn Morris2017-12-121-11/+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-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-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-011-2/+4
| | | | | | | | Fix treatment of generated files.
* | Merge from origin/emacs-26Paul Eggert2017-11-081-1/+1
|\ \ | |/ | | | | | | 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-081-1/+1
| |
* | emacs-25 → emacs-26Paul Eggert2017-09-251-1/+1
|/ | | | * admin/gitmerge.el (gitmerge-default-branch): Now emacs-26.
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-131-1/+1
| | | | | | | | | | | | | 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-291-1/+1
| | | | | * 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-071-1/+1
| | | | | | | | | | | 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-011-1/+1
|\ | | | | | | | | 2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017
| * Update copyright year to 2017Paul Eggert2016-12-311-1/+1
| | | | | | | | Run admin/update-copyright.
| * gitmerge: Add cherry pick to gitmerge-skip-regexpDavid Engster2016-10-061-2/+4
| | | | | | | | | | | | | | * 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-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | gitmerge: Add cherry pick to gitmerge-skip-regexpDavid Engster2016-05-011-2/+2
| | | | | | | | | | * gitmerge.el (gitmerge-skip-regexp): Add "cherry picked from commit", which is the string appended by 'git cherry-pick -x'.
* | Compute a better commit message for mergesPaul Eggert2016-03-221-7/+5
| | | | | | | | | | | | | | | | | | Problem reported by David Engster in: http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01270.html * admin/gitmerge.el (gitmerge-commit-message): Truncate the computed commit message to at most 72 characters per line. (gitmerge-maybe-resume): Don’t use "-" as the commit message for merges; use the computed commit message instead.
* | * admin/gitmerge.el (gitmerge-skip-regexp): Add "no need to merge".Paul Eggert2016-03-221-1/+1
| |
* | Change do-not-merge pattern to "do not merge"Paul Eggert2016-03-221-4/+5
| | | | | | | | | | | | | | | | | | This should avoid the problem we recently had with automatically-generated merge messages, while still letting people specify commits not to merge. * admin/gitmerge.el (gitmerge-skip-regexp): Add "do not merge". (gitmerge-highlight-skip-regexp): Fold case when searching for gitmerge-skip-regexp.
* | Keep "merge" commits by default in gitmergePaul Eggert2016-03-221-1/+1
| | | | | | | | | | | | * admin/gitmerge.el (gitmerge-skip-regexp): Omit "merge", as it causes false positives. See: http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01234.html
* | Merge from origin/emacs-25John Wiegley2016-01-111-1/+1
|\ \ | |/ | | | | | | | | ef33bc7 Spelling and grammar fixes 9c3dbab Fix copyright years by hand 0e96320 Update copyright year to 2016
| * Update copyright year to 2016Paul Eggert2016-01-011-1/+1
| | | | | | | | Run admin/update-copyright.
* | * admin/gitmerge.el: Tweaks that seemed necessaryStefan Monnier2015-12-251-2/+10
| | | | | | | | | | * admin/gitmerge.el (gitmerge-skip-regexp): Remove "sync". (gitmerge-maybe-resume): Provide explicit empty commit message.
* | gitmerge: Fix git log commandDavid Engster2015-11-141-3/+3
| | | | | | | | | | | | | | * admin/gitmerge.el (gitmerge-missing): Use '--left-only' since we only want commits from the branch that is to be merged. (gitmerge-setup-log-buffer): Use the same symmetric range as in `gitmerge-missing'.
* | gitmerge: Try to detect cherry-picksDavid Engster2015-11-141-3/+3
|/ | | | | | | * admin/gitmerge.el (gitmerge-default-branch): Change to origin/emacs-25. (gitmerge-missing): Use symmetric difference ('...') between branch and master so that cherry-picks can be detected.
* Improve generated ChangeLog for gitmerge.el commits. (Bug#20717)Glenn Morris2015-06-101-1/+4
| | | | | | | | | * build-aux/gitlog-to-changelog: Handle gitmerge.el skipped commits. * admin/gitmerge.el (gitmerge-commit-message): Exclude "skipped" messages from ChangeLog once again. ; * ChangLog.2: Related fixes.
* * admin/gitmerge.el (gitmerge-commit-message):Glenn Morris2015-06-051-1/+1
| | | | Revert to including "skipped" messages in ChangeLog once again.
* * admin/gitmerge.el (gitmerge-commit-message):Glenn Morris2015-06-011-1/+2
| | | | Exclude "skipped" messages from ChangeLog.
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
| | | | Run admin/update-copyright.
* Merge from emacs-24Stefan Monnier2014-12-051-14/+11
|
* Spelling fix.Paul Eggert2014-11-281-4/+4
|
* admin: Add gitmerge.elDavid Engster2014-11-271-0/+528
* gitmerge.el: New file.
View Lorry Controller Status