procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gitmerge: Add cherry pick to gitmerge-skip-regexp

Browse source 
* gitmerge.el (gitmerge-skip-regexp): Add "cherry picked from commit",
  which is the string appended by 'git cherry-pick -x'.
This commit is contained in:
David Engster 2016-05-01 21:05:18 +02:00
parent 5942c18e9a
commit f648e48669
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
admin/gitmerge.el
View file

@ -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.")