emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 874f69a: * admin/gitmerge.el (gitmerge-skip-regexp)


From: Glenn Morris
Subject: [Emacs-diffs] master 874f69a: * admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.
Date: Mon, 10 Dec 2018 12:42:30 -0500 (EST)

branch: master
commit 874f69acecf0c6c3c4886375c092fb389d207241
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.
---
 admin/gitmerge.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 6dedee8..e7d2567 100644
--- 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.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]