From: David Engster <deng@randomsample.de>
To: Noam Postavsky <npostavs@users.sourceforge.net>
Cc: Emacs developers <emacs-devel@gnu.org>
Subject: Re: Some proposed backports from master to emacs-25
Date: Tue, 04 Oct 2016 08:07:50 +0200 [thread overview]
Message-ID: <87lgy43avd.fsf@engster.org> (raw)
In-Reply-To: <CAM-tV-9PQM-4AqQOA5YYKRTmEvGe-fnhgMS1xD5uvFT=j2o9Hw@mail.gmail.com> (Noam Postavsky's message of "Mon, 3 Oct 2016 18:59:50 -0400")
Noam Postavsky writes:
> On Sun, Oct 2, 2016 at 10:05 AM, <npostavs@users.sourceforge.net> 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
next prev parent reply other threads:[~2016-10-04 6:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-02 14:05 Some proposed backports from master to emacs-25 npostavs
2016-10-02 14:54 ` Eli Zaretskii
2016-10-02 16:40 ` Noam Postavsky
2016-10-03 7:06 ` Eli Zaretskii
2016-10-03 22:59 ` Noam Postavsky
2016-10-04 6:07 ` David Engster [this message]
2016-10-04 6:34 ` Eli Zaretskii
2016-10-04 6:51 ` David Engster
2016-10-04 7:54 ` Eli Zaretskii
2016-10-04 12:02 ` Noam Postavsky
2016-10-04 12:18 ` Eli Zaretskii
2016-10-07 1:42 ` Noam Postavsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lgy43avd.fsf@engster.org \
--to=deng@randomsample.de \
--cc=emacs-devel@gnu.org \
--cc=npostavs@users.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.