diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-01-15 12:28:50 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-01-15 12:29:28 -0800 |
| commit | 597ede7e5b3c965f1653d15c964e86ccb989a62f (patch) | |
| tree | 53ce5185be7978fdf9cdaefa8a685f4f0ece9d82 /admin/gitmerge.el | |
| parent | 72ee93d68daea00e2ee69417afd4e31b3145a9fa (diff) | |
| download | emacs-597ede7e5b3c965f1653d15c964e86ccb989a62f.tar.gz emacs-597ede7e5b3c965f1653d15c964e86ccb989a62f.tar.bz2 emacs-597ede7e5b3c965f1653d15c964e86ccb989a62f.zip | |
Small gitmerge-skip-regexp fix
* admin/gitmerge.el (gitmerge-skip-regexp): Update for new format
of "bump version" message that seems to have appeared.
Diffstat (limited to 'admin/gitmerge.el')
| -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 71b1761970c..6011d9bd38f 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -52,7 +52,7 @@ ;; caused false positives. --Stef (let ((skip "back[- ]?port\\|cherry picked from commit\\|\ \\(do\\( no\\|n['’]\\)t\\|no need to\\) merge\\|\ -bump version\\|Auto-commit")) +bump \\(Emacs \\)?version\\|Auto-commit")) (if noninteractive skip ;; "Regenerate" is quite prone to false positives. ;; We only want to skip merging things like AUTHORS and ldefs-boot. |