[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Some proposed backports from master to emacs-25
From: |
David Engster |
Subject: |
Re: Some proposed backports from master to emacs-25 |
Date: |
Tue, 04 Oct 2016 08:51:51 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) |
Eli Zaretskii writes:
>> From: Noam Postavsky <address@hidden>
>> Date: Mon, 3 Oct 2016 18:59:50 -0400
>>
>
>> On Sun, Oct 2, 2016 at 10:05 AM, <address@hidden> wrote:
>> >
>> > Git added "cherry picked from commit" but it looks like
>> > gitmerge-skip-regexp wouldn't match that, should I change it to match?
>> >
>>
>> What about this question?
>
> Sorry, forgot to answer. I see no problems, as gitmerge-skip-regexp
> already handles that:
>
> (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...
-David