diff options
| author | Paul Eggert | 2016-03-22 10:52:54 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-03-22 10:52:54 -0700 |
| commit | 6bd1e2203486ace170f5de15cf7d66146fc8cc87 (patch) | |
| tree | f497a0c2de375231af1ce1423ba2e6d35d90e48e /admin | |
| parent | 780a605e1d2de4b975e6f1f29b491c9af419dcff (diff) | |
| download | emacs-6bd1e2203486ace170f5de15cf7d66146fc8cc87.tar.gz emacs-6bd1e2203486ace170f5de15cf7d66146fc8cc87.zip | |
Keep "merge" commits by default in gitmerge
* admin/gitmerge.el (gitmerge-skip-regexp): Omit "merge", as it
causes false positives. See:
http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01234.html
Diffstat (limited to 'admin')
| -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 ae863fdecb5..ed876436356 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el | |||
| @@ -50,7 +50,7 @@ | |||
| 50 | (defvar gitmerge-skip-regexp | 50 | (defvar gitmerge-skip-regexp |
| 51 | ;; We used to include "sync" in there, but in my experience it only | 51 | ;; We used to include "sync" in there, but in my experience it only |
| 52 | ;; caused false positives. --Stef | 52 | ;; caused false positives. --Stef |
| 53 | "back[- ]?port\\|merge\\|re-?generate\\|bump version\\|from trunk\\|\ | 53 | "back[- ]?port\\|re-?generate\\|bump version\\|from trunk\\|\ |
| 54 | Auto-commit" | 54 | Auto-commit" |
| 55 | "Regexp matching logs of revisions that might be skipped. | 55 | "Regexp matching logs of revisions that might be skipped. |
| 56 | `gitmerge-missing' will ask you if it should skip any matches.") | 56 | `gitmerge-missing' will ask you if it should skip any matches.") |