/usr/lib/git-core/git-rebase: 590: cannot open /home/mathieu/dummy/.git/rebase-merge/rewritten: No such file

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Dear all,

  I tried a rebase of my local branch (say 'local') against master.
Here is what I did:

$ git checkout local
$ git rebase -s ours master
...
Already applied: 0017 smore more work
/usr/lib/git-core/git-rebase: 590: cannot open
/home/mathieu/dummy/.git/rebase-merge/rewritten: No such file
All done.

I have no idea on how to get back to the initial state. Where did my
'local' branch go ? Using git 1.7.2.3

Thanks
-- 
Mathieu
--
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


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]