mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

* admin/gitmerge.el (gitmerge-skip-regexp): Be more restrictive.

Browse Source
This commit is contained in:
Glenn Morris 2019-12-30 09:28:29 -08:00
parent 248c5e103d
commit e729ff504b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/gitmerge.el
View File

@ -52,7 +52,7 @@
;; caused false positives. --Stef
(let ((skip "back[- ]?port\\|cherry picked from commit\\|\
\\(do\\( no\\|n['’]\\)t\\|no need to\\) merge\\|not to be merged\\|\
bump \\(Emacs \\)?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.