[Emacs-diffs] emacs-25 a6e0a67: gitmerge: Add cherry pick to gitmerge-skip-regexp

[Noam Postavsky]

branch: emacs-25
commit a6e0a6770129e612398c8db98cd214586dc250f4
Author: David Engster <address@hidden>
Commit: Noam Postavsky <address@hidden>

    gitmerge: Add cherry pick to gitmerge-skip-regexp
    
    * gitmerge.el (gitmerge-skip-regexp): Add "cherry picked from commit",
      which is the string appended by 'git cherry-pick -x'.
    
    (cherry picked from commit f648e4866981b142fca788372e1fd9013a0bb16a)
---
 admin/gitmerge.el |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index a08a369..b74c128 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -48,8 +48,10 @@
 (require 'smerge-mode)
 
 (defvar gitmerge-skip-regexp
-  "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk\\|\
-Auto-commit"
+  ;; We used to include "sync" in there, but in my experience it only
+  ;; caused false positives.  --Stef
+  "back[- ]?port\\|cherry picked from commit\\|\\(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.")