Cherry Picking git Patches and ChangeLog

[Andreas Schwab]

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."