Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
6116bd7e
Commit
6116bd7e
authored
May 02, 2012
by
Glenn Morris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".
parent
7adecb99
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
admin/ChangeLog
admin/ChangeLog
+5
-1
admin/bzrmerge.el
admin/bzrmerge.el
+2
-1
No files found.
admin/ChangeLog
View file @
6116bd7e
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.
...
...
admin/bzrmerge.el
View file @
6116bd7e
...
...
@@ -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.
")
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment