git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date
Mar 22, 2011, 15:18 UTC
Message-ID
<AANLkTikn30scXd2F3z1QqntROyqfcvEBF4gEFtHyU=9c@mail.gmail.com>
In-Reply-To
<AANLkTinx1bDaChNwrn6pQjxbyZ-rH6TZ_5JuWszY1LTE@mail.gmail.com>
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
Previous: Mathieu Malaterre
Message 2 of 2 in “/usr/lib/git-core/git-rebase: 590: cannot open /home/mathieu/dummy/.git/rebase-merge/rewritten: No such file”
  1. Mathieu MalaterreMar 22, 2011
  2. Mathieu MalaterreMar 22, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.