Re: when git-rebase -i fails to cherry-pick

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jul 23, 2007, 23:08 UTC
Message-ID: <Pine.LNX.4.64.0707240005240.14781@racer.site>
In-Reply-To: <20070723225402.GB22513@informatik.uni-freiburg.de>

Hi,

On Tue, 24 Jul 2007, Uwe Kleine-K?nig wrote:

> even though git-rebase -i is still young, I'm already a big fan of it.

Nice!

Show 8 quoted lines

> I just want to suggest two minor things:
> 
> - If a cherry-pick fails, it tells me to resolve my conflicts, 'git add
>   <paths>' and to do 'git commit -c $sha1id'.
> 
>   But it doesn't tell me, how I continue to rebase after that.
> 
>   'git rebase -i --continue' works.

Actually, even "git rebase --continue" works. And you do not really have to commit, either, just updating your index is fine. In fact, if you say "git reset --hard", it will skip the commit.

> - If a cherry-pick of a commit to be squashed fails, the instruction to
>   do 'git commit -c $sha1id' is wrong, because then I don't get both
>   message to squash.

Yes, it is a leftover from the bad old days, when this script was called edit-patch-series, and I was a rebase hater.

In the meantime, somebody on IRC explained to me how rebase works, and that rebase lovers were quite annoyed not to be able to just resolve the conflicts and "git rebase --continue".

I'd appreciate if you prepared a patch with better explanations, and also reviewed the man page, if it is in good shape (and does not lie about the current behaviour).

Thanks, Dscho