procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.

Browse source
This commit is contained in:
Glenn Morris 2018-12-10 12:42:17 -05:00
parent edd0c24116
commit 874f69acec
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

@ -51,7 +51,7 @@
;; We used to include "sync" in there, but in my experience it only
;; caused false positives. --Stef
(let ((skip "back[- ]?port\\|cherry picked from commit\\|\
\\(do\\( no\\|n['’]\\)t\\|no need to\\) merge\\|\
\\(do\\( no\\|n['’]\\)t\\|no need to\\) merge\\|not to be merged\\|\
bump \\(Emacs \\)?version\\|Auto-commit"))
(if noninteractive skip
;; "Regenerate" is quite prone to false positives.