From: Joel Sherrill <joel.sherrill@oarcorp.com>
To: Andreas Schwab <schwab@linux-m68k.org>
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 22:46:00 -0000 [thread overview]
Message-ID: <F9484EDF-26AF-478A-B61E-40FBC1A27CCC@oarcorp.com> (raw)
In-Reply-To: <874mplvq2i.fsf@igel.home>
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.
Ideally we would just reference the upstream patch directly in the build system and let patch do it. We want this to be done as part of users building tools from source.
>Andreas.
--joel
next prev parent reply other threads:[~2015-03-15 22:46 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 [this message]
2015-03-15 23:03 ` Andreas Schwab
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=F9484EDF-26AF-478A-B61E-40FBC1A27CCC@oarcorp.com \
--to=joel.sherrill@oarcorp.com \
--cc=chrisj@rtems.org \
--cc=gdb@sourceware.org \
--cc=schwab@linux-m68k.org \
/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).