diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 12:53:54 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 12:57:24 -0700 |
| commit | b08237185ec044c8afff0feb88a126512b33a6d8 (patch) | |
| tree | bba338084846f88e814d5569f5806057aef32575 /admin | |
| parent | 582962a3a184135047c5809b1172691a1c5f2586 (diff) | |
Change do-not-merge pattern to "do not merge"
This should avoid the problem we recently had with
automatically-generated merge messages, while still letting people
specify commits not to merge.
* admin/gitmerge.el (gitmerge-skip-regexp): Add "do not merge".
(gitmerge-highlight-skip-regexp): Fold case when searching
for gitmerge-skip-regexp.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/gitmerge.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index ed87643635..a07f57a600 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\\|re-?generate\\|bump version\\|from trunk\\|\ + "back[- ]?port\\|do not 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.") @@ -171,9 +171,10 @@ Auto-commit" (defun gitmerge-highlight-skip-regexp () "Highlight strings that match `gitmerge-skip-regexp'." (save-excursion - (while (re-search-forward gitmerge-skip-regexp nil t) - (put-text-property (match-beginning 0) (match-end 0) - 'face 'font-lock-warning-face)))) + (let ((case-fold-search t)) + (while (re-search-forward gitmerge-skip-regexp nil t) + (put-text-property (match-beginning 0) (match-end 0) + 'face 'font-lock-warning-face))))) (defun gitmerge-missing (from) "Return the list of revisions that need to be merged from FROM. |