diff options
| author | David Engster <deng@randomsample.de> | 2016-05-01 21:05:18 +0200 |
|---|---|---|
| committer | David Engster <deng@randomsample.de> | 2016-05-01 21:17:55 +0200 |
| commit | f648e4866981b142fca788372e1fd9013a0bb16a (patch) | |
| tree | c1a0c01b1ee806a6d8802fd306bb76a83c59369f /admin | |
| parent | 5942c18e9a4f04996d80071b717049f55c1f69d8 (diff) | |
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'.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/gitmerge.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 6a52f7a60a..d2cb1e8df0 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.") |