{"thread":{"id":"26831","subject":"/usr/lib/git-core/git-rebase: 590: cannot open /home/mathieu/dummy/.git/rebase-merge/rewritten: No such file","startedAt":"2011-03-22T15:04:12Z","lastAt":"2011-03-22T15:18:30Z","messageCount":2,"participants":["Mathieu Malaterre"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"164056","messageId":"AANLkTinx1bDaChNwrn6pQjxbyZ-rH6TZ_5JuWszY1LTE@mail.gmail.com","threadId":"26831","inReplyTo":null,"subject":"/usr/lib/git-core/git-rebase: 590: cannot open /home/mathieu/dummy/.git/rebase-merge/rewritten: No such file","fromName":"Mathieu Malaterre","fromEmail":"mathieu.malaterre@gmail.com","sentAt":"2011-03-22T15:04:12Z","receivedAt":"2011-03-22T15:04:12Z","isPatch":false,"sender":{"key":"mathieu.malaterre@gmail.com","avatar":"https://gravatar.com/avatar/0728db14da3b5f9cb00476f504394196a14dac116214d8114f402fad0871bb86?d=mp&s=160"},"body":"Dear all,\n\n  I tried a rebase of my local branch (say 'local') against master.\nHere is what I did:\n\n$ git checkout local\n$ git rebase -s ours master\n...\nAlready applied: 0017 smore more work\n/usr/lib/git-core/git-rebase: 590: cannot open\n/home/mathieu/dummy/.git/rebase-merge/rewritten: No such file\nAll done.\n\nI have no idea on how to get back to the initial state. Where did my\n'local' branch go ? Using git 1.7.2.3\n\nThanks\n-- \nMathieu\n"},{"id":"164058","messageId":"AANLkTikn30scXd2F3z1QqntROyqfcvEBF4gEFtHyU=9c@mail.gmail.com","threadId":"26831","inReplyTo":"AANLkTinx1bDaChNwrn6pQjxbyZ-rH6TZ_5JuWszY1LTE@mail.gmail.com","subject":"/usr/lib/git-core/git-rebase: 590: cannot open /home/mathieu/dummy/.git/rebase-merge/rewritten: No such file","fromName":"Mathieu Malaterre","fromEmail":"mathieu.malaterre@gmail.com","sentAt":"2011-03-22T15:18:30Z","receivedAt":"2011-03-22T15:18:30Z","isPatch":false,"sender":{"key":"mathieu.malaterre@gmail.com","avatar":"https://gravatar.com/avatar/0728db14da3b5f9cb00476f504394196a14dac116214d8114f402fad0871bb86?d=mp&s=160"},"body":"Dear all,\n\n I tried a rebase of my local branch (say 'local') against master.\nHere is what I did:\n\n$ git checkout local\n$ git rebase -s ours master\n...\nAlready applied: 0017 smore more work\n/usr/lib/git-core/git-rebase: 590: cannot open\n/home/mathieu/dummy/.git/rebase-merge/rewritten: No such file\nAll done.\n\nI have no idea on how to get back to the initial state. Where did my\n'local' branch go ? Using git 1.7.2.3\n\nI can find some references:\n\n$ cd .git && grep -lr \"smore more work\" *\nlogs/refs/heads/progresscallback\nlogs/HEAD\n\nThanks a bunch !\n-- \nMathieu\n"}]}