Re: Git Bug - diff in commit message.

Michael Witten wrote:

On Thu, Sep 8, 2011 at 14:49, anikey [off-list ref] wrote:

quoted

Hi, peops. I'm pretty much sure that's a bug.

What I did was putting git diff (i needed to tell people that for my changes
to start working they needed to aplly message-inline patch to some code
which was not under git) in commit message. Like adding:

It would appear that `git rebase' is in fact producing patches with
`git format-patch' and then applying the resulting patches with `git
am', which gets confused by your inline diff; this can be clearly seen
in the `git-rebase--am[.sh]' file.

Perhaps `git rebase' should be reimplemented to use `git cherry-pick',
or does that suffer from the same problem?

It doesn't, since it uses a three-way merge.  But there's no real
reason to reimplement anything; just use an interactive rebase, it
uses cherry-pick in a loop.


-- 
Thomas Rast
trast@{inf,student}.ethz.ch