Eric wrote:
> I wanted to pass this on, because it cost me 30 minutes and a few
> hairs...
> 
> If you happen to abort in the middle of the a rebase, and you start
> getting and error:
> "interactive rebase already started"
> 
> To fix it: go into your .git directory, and delete the folder '.dotest-
> merge'.

in version 1.6.0
git rebase -i --abort
cleans it

Regards,
-- 
                Luís Pereira

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to