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

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Uwe <ukleinek@...>
Cc: <git@...>
Date: Monday, July 23, 2007 - 7:08 pm

Hi,

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


Nice!


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.


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

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
when git-rebase -i fails to cherry-pick, Uwe , (Mon Jul 23, 6:54 pm)
Re: when git-rebase -i fails to cherry-pick, Johannes Schindelin, (Mon Jul 23, 7:08 pm)
Re: when git-rebase -i fails to cherry-pick, Uwe , (Tue Jul 24, 4:05 pm)
[PATCH] rebase -i: fix interrupted squashing, Johannes Schindelin, (Tue Jul 24, 4:43 pm)
Re: [PATCH] rebase -i: fix interrupted squashing, Johannes Schindelin, (Fri Jul 27, 1:18 pm)