diff options
| author | David Engster | 2016-05-01 21:05:18 +0200 |
|---|---|---|
| committer | Noam Postavsky | 2016-10-06 21:39:55 -0400 |
| commit | a6e0a6770129e612398c8db98cd214586dc250f4 (patch) | |
| tree | e0c85aa3d06abc2d5e9d2769e1fa2b0748cfc7dc /admin | |
| parent | fb12af2084a751566ff5445654d75f5653f2253d (diff) | |
| download | emacs-a6e0a6770129e612398c8db98cd214586dc250f4.tar.gz emacs-a6e0a6770129e612398c8db98cd214586dc250f4.zip | |
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)
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/gitmerge.el | 6 |
1 files changed, 4 insertions, 2 deletions
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 @@ | |||
| 48 | (require 'smerge-mode) | 48 | (require 'smerge-mode) |
| 49 | 49 | ||
| 50 | (defvar gitmerge-skip-regexp | 50 | (defvar gitmerge-skip-regexp |
| 51 | "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk\\|\ | 51 | ;; We used to include "sync" in there, but in my experience it only |
| 52 | Auto-commit" | 52 | ;; caused false positives. --Stef |
| 53 | "back[- ]?port\\|cherry picked from commit\\|\\(do not\\|no need to\\) merge\\|\ | ||
| 54 | re-?generate\\|bump version\\|from trunk\\|Auto-commit" | ||
| 53 | "Regexp matching logs of revisions that might be skipped. | 55 | "Regexp matching logs of revisions that might be skipped. |
| 54 | `gitmerge-missing' will ask you if it should skip any matches.") | 56 | `gitmerge-missing' will ask you if it should skip any matches.") |
| 55 | 57 | ||