]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 582962a) | patch
Change do-not-merge pattern to "do not merge"
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 22 Mar 2016 19:53:54 +0000 (12:53 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 22 Mar 2016 19:57:24 +0000 (12:57 -0700)
commitb08237185ec044c8afff0feb88a126512b33a6d8
treebba338084846f88e814d5569f5806057aef32575tree | snapshot
parent582962a3a184135047c5809b1172691a1c5f2586commit | 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.
admin/gitmerge.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.