diff options
| author | Alan Mackenzie <acm@muc.de> | 2017-03-29 17:58:37 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2017-03-29 17:58:37 +0000 |
| commit | b7ec73f6905df99978f7183ac8e83a3be56edc6c (patch) | |
| tree | ff002615e157e4148c054c63fa5857f8305e30fe /admin | |
| parent | 7d2d954d6a4554ee1d17b6a04a9f3aead72b6ece (diff) | |
| download | emacs-b7ec73f6905df99978f7183ac8e83a3be56edc6c.tar.gz | |
Amend gitmerge to recognize the injunction "don't merge".
* admin/gitmerge.el (gitmerge-skip-regexp): amend regexp to match "don't" as
well as "do not".
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 c3981dd4b06..a0efce5ea69 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\\|cherry picked from commit\\|\\(do not\\|no need to\\) merge\\|\ + "back[- ]?port\\|cherry picked from commit\\|\\(do\\( no\\|n['’]\\)t\\|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.") |