From: Andreas Schwab <schwab@linux-m68k.org>
To: Joel Sherrill <joel.sherrill@oarcorp.com>
Cc: "gdb\@sourceware.org" <gdb@sourceware.org>,
Chris Johns <chrisj@rtems.org>
Subject: Re: Cherry Picking git Patches and ChangeLog
Date: Sun, 15 Mar 2015 23:03:00 -0000 [thread overview]
Message-ID: <87wq2huamh.fsf@igel.home> (raw)
In-Reply-To: <F9484EDF-26AF-478A-B61E-40FBC1A27CCC@oarcorp.com> (Joel Sherrill's message of "Sun, 15 Mar 2015 17:46:40 -0500")
Joel Sherrill <joel.sherrill@oarcorp.com> writes:
> On March 15, 2015 5:44:21 PM CDT, Andreas Schwab <schwab@linux-m68k.org> wrote:
>>Joel Sherrill <joel.sherrill@oarcorp.com> writes:
>>
>>> I know that this is really a git/ChangeLog/patch question but
>>> since it comes up in context of gdb, I am asking here. How
>>> does one deal with patches that would apply cleanly except
>>> for ChangeLog?
>>
>>git-merge-changelog can help here.
>
> That will help if we want to manually touch the patches and update them for the tarball.
Please explain what you are trying to do. Cherry picking will use the
configured merge driver.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2015-03-15 23:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-15 22:38 Joel Sherrill
2015-03-15 22:44 ` Andreas Schwab
2015-03-15 22:46 ` Joel Sherrill
2015-03-15 23:03 ` Andreas Schwab [this message]
2015-03-16 1:14 ` Joel Sherrill
2015-03-16 17:41 ` Andreas Schwab
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=87wq2huamh.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=chrisj@rtems.org \
--cc=gdb@sourceware.org \
--cc=joel.sherrill@oarcorp.com \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).