On Sunday 02 March 2008 1:30:16 am Jeff King wrote: > On Sat, Mar 01, 2008 at 03:29:37PM -0600, John Goerzen wrote: > > Two things to add: > > > > 1) This was a clean branch prior to rebase (git status was empty) > > > > 2) Adding -i to the rebase command, then making no changes to the > > list, caused the rebase to work perfectly. > > Yes, "rebase -i" works somewhat differently than an ordinary rebase. It > uses a series of cherry-picks rather than "format-patch | am". And the > bug is, I think, in "git-am". > > It probably would also have worked using "git rebase -m" which uses > merge strategies to rebase. I did try that. The resulting error message was slightly different, but not significantly so, if I remember correctly. -- John -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
