diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 15:46:30 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 15:46:49 -0700 |
| commit | 4fab26ba5ac381ce836eff521fc56d8d28570221 (patch) | |
| tree | efc15605a581c527b7490c5fc62dd19a31dc44ce /admin | |
| parent | b08237185ec044c8afff0feb88a126512b33a6d8 (diff) | |
* admin/gitmerge.el (gitmerge-skip-regexp): Add "no need to merge".
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/gitmerge.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index a07f57a600..74e6f80487 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -50,7 +50,7 @@ (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 merge\\|re-?generate\\|bump version\\|from trunk\\|\ + "back[- ]?port\\|\\(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.") |