{"thread":{"id":"19011","subject":"Unexpected messages by git rebase -m","startedAt":"2009-04-22T19:55:54Z","lastAt":"2009-04-22T19:55:54Z","messageCount":1,"participants":["Johannes Sixt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"111992","messageId":"200904222155.54422.j6t@kdbg.org","threadId":"19011","inReplyTo":null,"subject":"Unexpected messages by git rebase -m","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2009-04-22T19:55:54Z","receivedAt":"2009-04-22T19:55:54Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"I did the usual fix-up-the-second-commit procedure, this time with 'git \nrebase -m'. The result is OK, but rebase writes something unexpected:\n\ngit init\necho a > x && git add x && git commit -m A\necho b > x && git add x && git commit -m B\necho c > x && git add x && git commit -m C\ngit checkout HEAD^\necho b1 > x && git add x && git commit --amend -m B1\n\nHere we have this history:\n\n  A--B--C  <- master\n   \\\n    B1  <- detached HEAD\n\ngit rebase -m HEAD master\ngit rebase --skip\t# B is in conflict; we don't need it\ngit checkout master x\t# resolve another conflict\n\nNow look what rebase has to say:\n\n$ git rebase --continue \n[detached HEAD 90c7916] C\n 1 files changed, 1 insertions(+), 1 deletions(-)\nCommitted: 0001 C\nAlready applied: 0002 C\nAll done.\n\nNotice \"Committed: 0001 C\" followed by \"Already applied: 0002 C\". I'd expect \nonly \"Committed: 0002 C\". What's up?\n\n-- Hannes\n"}]}