Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 18:37:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

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'.

(cherry picked from commit f648e48669)
This commit is contained in:
David Engster 2016-05-01 21:05:18 +02:00 committed by Noam Postavsky
parent fb12af2084
commit a6e0a67701
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
admin/gitmerge.el
View file

@ -48,8 +48,10 @@
(require 'smerge-mode) (require 'smerge-mode)
(defvar gitmerge-skip-regexp (defvar gitmerge-skip-regexp
"back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk\\|\ ;; We used to include "sync" in there, but in my experience it only
Auto-commit" ;; 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. "Regexp matching logs of revisions that might be skipped.
`gitmerge-missing' will ask you if it should skip any matches.") `gitmerge-missing' will ask you if it should skip any matches.")