[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 597ede7: Small gitmerge-skip-regexp fix
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 597ede7: Small gitmerge-skip-regexp fix |
Date: |
Mon, 15 Jan 2018 15:29:46 -0500 (EST) |
branch: master
commit 597ede7e5b3c965f1653d15c964e86ccb989a62f
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Small gitmerge-skip-regexp fix
* admin/gitmerge.el (gitmerge-skip-regexp): Update for new format
of "bump version" message that seems to have appeared.
---
admin/gitmerge.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 71b1761..6011d9b 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -52,7 +52,7 @@
;; caused false positives. --Stef
(let ((skip "back[- ]?port\\|cherry picked from commit\\|\
\\(do\\( no\\|n['’]\\)t\\|no need to\\) merge\\|\
-bump version\\|Auto-commit"))
+bump \\(Emacs \\)?version\\|Auto-commit"))
(if noninteractive skip
;; "Regenerate" is quite prone to false positives.
;; We only want to skip merging things like AUTHORS and ldefs-boot.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 597ede7: Small gitmerge-skip-regexp fix,
Glenn Morris <=