* /usr/lib/git-core/git-rebase: 590: cannot open /home/mathieu/dummy/.git/rebase-merge/rewritten: No such file
@ 2011-03-22 15:04 Mathieu Malaterre
2011-03-22 15:18 ` Mathieu Malaterre
0 siblings, 1 reply; 2+ messages in thread
From: Mathieu Malaterre @ 2011-03-22 15:04 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* /usr/lib/git-core/git-rebase: 590: cannot open /home/mathieu/dummy/.git/rebase-merge/rewritten: No such file
2011-03-22 15:04 /usr/lib/git-core/git-rebase: 590: cannot open /home/mathieu/dummy/.git/rebase-merge/rewritten: No such file Mathieu Malaterre
@ 2011-03-22 15:18 ` Mathieu Malaterre
0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Malaterre @ 2011-03-22 15:18 UTC (permalink / raw)
To: git
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 !
--
Mathieu
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-22 15:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-22 15:04 /usr/lib/git-core/git-rebase: 590: cannot open /home/mathieu/dummy/.git/rebase-merge/rewritten: No such file Mathieu Malaterre
2011-03-22 15:18 ` Mathieu Malaterre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).