[Emacs-diffs] master f648e48: gitmerge: Add cherry pick to gitmerge-skip-regexp

[David Engster]

branch: master
commit f648e4866981b142fca788372e1fd9013a0bb16a
Author: David Engster <address@hidden>
Commit: David Engster <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'.
---
 admin/gitmerge.el |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 6a52f7a..d2cb1e8 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -50,8 +50,8 @@
 (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\\|no need to\\) merge\\|re-?generate\\|bump 
version\\|from trunk\\|\
-Auto-commit"
+  "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.")