[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:07:50 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) |
Noam Postavsky writes:
> 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?
If the cherry-pick succeeds without conflict, git can detect them
through the patch-id and add a cherry-mark, which in turn will make
gitmerge ignore those commits.
If there is a conflict, you will have to manually commit anyway and you
should add 'backport' to the commit message.
-David
- Some proposed backports from master to emacs-25, npostavs, 2016/10/02
- Re: Some proposed backports from master to emacs-25, Eli Zaretskii, 2016/10/02
- Re: Some proposed backports from master to emacs-25, Noam Postavsky, 2016/10/03
- Re: Some proposed backports from master to emacs-25,
David Engster <=
- Re: Some proposed backports from master to emacs-25, Eli Zaretskii, 2016/10/04
- Re: Some proposed backports from master to emacs-25, David Engster, 2016/10/04
- Re: Some proposed backports from master to emacs-25, Eli Zaretskii, 2016/10/04
- Re: Some proposed backports from master to emacs-25, Noam Postavsky, 2016/10/04
- Re: Some proposed backports from master to emacs-25, Eli Zaretskii, 2016/10/04
- Re: Some proposed backports from master to emacs-25, Noam Postavsky, 2016/10/06