From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
To: git@vger.kernel.org
Subject: /usr/lib/git-core/git-rebase: 590: cannot open /home/mathieu/dummy/.git/rebase-merge/rewritten: No such file
Date: Tue, 22 Mar 2011 16:04:12 +0100 [thread overview]
Message-ID: <AANLkTinx1bDaChNwrn6pQjxbyZ-rH6TZ_5JuWszY1LTE@mail.gmail.com> (raw)
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
next reply other threads:[~2011-03-22 15:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-22 15:04 Mathieu Malaterre [this message]
2011-03-22 15:18 ` /usr/lib/git-core/git-rebase: 590: cannot open /home/mathieu/dummy/.git/rebase-merge/rewritten: No such file Mathieu Malaterre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTinx1bDaChNwrn6pQjxbyZ-rH6TZ_5JuWszY1LTE@mail.gmail.com \
--to=mathieu.malaterre@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).