From: David Engster <deng@randomsample.de>
Date: Sun, 1 May 2016 19:05:18 +0000 (+0200)
Subject: gitmerge: Add cherry pick to gitmerge-skip-regexp
X-Git-Tag: emacs-25.1.90~140
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a6e0a67;p=emacs.git

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)
---

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index a08a36937b1..b74c128ae57 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.")