[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Some proposed backports from master to emacs-25

From: Noam Postavsky
Subject: Re: Some proposed backports from master to emacs-25
Date: Tue, 4 Oct 2016 08:02:11 -0400

On Tue, Oct 4, 2016 at 3:54 AM, Eli Zaretskii <address@hidden> wrote:
>> 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?

Yeah, so it should be fine, except that it's potentially a bit
confusing (I asked the question because I only looked at the emacs-25

reply via email to

[Prev in Thread] Current Thread [Next in Thread]