projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
edd0c24
)
* admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.
author
Glenn Morris
<rgm@gnu.org>
Mon, 10 Dec 2018 17:42:17 +0000
(12:42 -0500)
committer
Glenn Morris
<rgm@gnu.org>
Mon, 10 Dec 2018 17:42:17 +0000
(12:42 -0500)
admin/gitmerge.el
patch
|
blob
|
history
diff --git
a/admin/gitmerge.el
b/admin/gitmerge.el
index 6dedee8dd14f1719fb94ab2199e9a267abf3324b..e7d25674c815435dc68b7cfe9022efa3c1f0b810 100644
(file)
--- a/
admin/gitmerge.el
+++ b/
admin/gitmerge.el
@@
-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.