mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-31 11:13:50 +00:00
Code Issues Releases Activity

* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".

Browse Source
This commit is contained in:
Glenn Morris 2012-05-02 00:12:52 -07:00
parent 7adecb9936
commit 6116bd7e7a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/ChangeLog
View File

@ -1,3 +1,7 @@
2012-05-02 Glenn Morris <rgm@gnu.org>
* bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".
2012-04-10 Glenn Morris <rgm@gnu.org>
* bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
@ -1262,7 +1266,7 @@
;; coding: utf-8
;; End:
Copyright (C) 2001-2012 Free Software Foundation, Inc.
Copyright (C) 2001-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.

3
admin/bzrmerge.el
View File

@ -28,7 +28,8 @@
(require 'cl)) ; assert
(defvar bzrmerge-skip-regexp
"back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk"
"back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk\\|\
Auto-commit"
"Regexp matching logs of revisions that might be skipped.
`bzrmerge-missing' will ask you if it should skip any matches.")