Linus Torvalds <torvalds@xxxxxxxx> writes: > As to rebase, it often is very nice, but on the other hand, it leaves > things in a total mess when it fails, which is a pity. Maybe there's a > nice way to just continue, but I end up just doing a > > git reset --hard ORIG_HEAD > > to undo the failed rebase. > > Junio, is there some magic to restart a rebase after you've fixed up the > conflicts? The modern rebase is essentially git-format-patch piped to git-am (with -3 flag to allow falling back to three-way merge), and all the familiar "the patch did not apply -- what now?" techniques can be employed. Since the pre-image blobs recorded in the intermediate format-patch output by definition exist in your repository, it always falls back to three-way merge when the patch does not apply cleanly. Then you can resolve and say "git am --resolved" to continue. - : 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