From 4fab26ba5ac381ce836eff521fc56d8d28570221 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 22 Mar 2016 15:46:30 -0700 Subject: [PATCH] * admin/gitmerge.el (gitmerge-skip-regexp): Add "no need to merge". --- admin/gitmerge.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/gitmerge.el b/admin/gitmerge.el index a07f57a6008..74e6f80487b 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -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\\|do not merge\\|re-?generate\\|bump version\\|from trunk\\|\ + "back[- ]?port\\|\\(do not\\|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.") -- 2.39.5