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

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

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

I can find some references:

$ cd .git && grep -lr "smore more work" * logs/refs/heads/progresscallback logs/HEAD

Thanks a bunch !