Junio C Hamano wrote:
 > Doesn't "git rebase --abort" work for you at this point?

It probably would have, but he ran another "git rebase" immediately 
after hitting ctrl-C, not realizing that the interrupted one had left 
things in an odd state. I tried --abort after the fact and it said there 
was no rebase in progress; I assume the second rebase wiped out the 
temporary state from the first one.

However, all's well; Shawn's suggestion of using the reflog worked fine. 
We were able to reset back to HEAD@{3 hours ago} then do the rebase 
again, and it did the right thing. Even though we had a filesystem 
snapshot to fall back on, needless to say we were very happy to see 
there was a way to recover using nothing but git commands.

Hooray for the reflog being turned on by default!

-Steve
-
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