mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-25 10:47:00 +00:00
Code Issues Releases Activity

Amend gitmerge to recognize the injunction "don't merge".

Browse Source 
* admin/gitmerge.el (gitmerge-skip-regexp): amend regexp to match "don't" as
well as "do not".
This commit is contained in:
Alan Mackenzie 2017-03-29 17:58:37 +00:00
parent 7d2d954d6a
commit b7ec73f690
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/gitmerge.el
View File

@ -50,7 +50,7 @@
(defvar gitmerge-skip-regexp
;; We used to include "sync" in there, but in my experience it only
;; caused false positives. --Stef
"back[- ]?port\\|cherry picked from commit\\|\\(do not\\|no need to\\) merge\\|\
"back[- ]?port\\|cherry picked from commit\\|\\(do\\( no\\|n['’]\\)t\\|no need to\\) merge\\|\
re-?generate\\|bump version\\|from trunk\\|Auto-commit"
"Regexp matching logs of revisions that might be skipped.
`gitmerge-missing' will ask you if it should skip any matches.")