[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Some proposed backports from master to emacs-25
|
From: |
Eli Zaretskii |
|
Subject: |
Re: Some proposed backports from master to emacs-25 |
|
Date: |
Tue, 04 Oct 2016 10:54:42 +0300 |
> From: David Engster <address@hidden>
> Cc: Noam Postavsky <address@hidden>, address@hidden
> Date: Tue, 04 Oct 2016 08:51:51 +0200
>
> > (defvar gitmerge-skip-regexp
> > ;; We used to include "sync" in there, but in my experience it only
> > ;; caused false positives. --Stef
> > "back[- ]?port\\|cherry picked from commit\\|\\(do not\\|no need to\\)
> > merge\\|\
> > ^^^^^^^^^^^^^^^^^^^^^^^^^
> > re-?generate\\|bump version\\|from trunk\\|Auto-commit"
> > "Regexp matching logs of revisions that might be skipped.
> > `gitmerge-missing' will ask you if it should skip any matches.")
>
> This is only on the master branch, though. I've no idea why I didn't
> commit this to emacs-25...
The merges are only done on master, right?