{"thread":{"id":"22889","subject":"git status and diff-files don't agree on unmerged file","startedAt":"2010-03-03T03:53:50Z","lastAt":"2010-03-03T03:53:50Z","messageCount":1,"participants":["Jay Soffian"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"136057","messageId":"76718491003021953l7c982c70vd2e9f082f1762fea@mail.gmail.com","threadId":"22889","inReplyTo":null,"subject":"git status and diff-files don't agree on unmerged file","fromName":"Jay Soffian","fromEmail":"jaysoffian@gmail.com","sentAt":"2010-03-03T03:53:50Z","receivedAt":"2010-03-03T03:53:50Z","isPatch":false,"sender":{"key":"jaysoffian@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155970?v=4"},"body":"I've run into an issue recently where I'll be rebasing, hit a\nconflict, resolve it, use \"git add\" (I think...) but rebase doesn't\nwant to continue. It seems there is a disagreement between diff-files\nand status while in this state:\n\n$ git --version\ngit version 1.7.0.1.242.ga1f88\n\n$ git status\n# Not currently on any branch.\n# Changes to be committed:\n#   (use \"git reset HEAD <file>...\" to unstage)\n#\n#\tmodified:   chrome/browser/cocoa/browser_window_controller.mm\n#\tmodified:   chrome/browser/cocoa/tab_strip_controller.h\n#\tmodified:   chrome/browser/cocoa/tab_strip_controller.mm\n#\n# Untracked files:\n#   (use \"git add <file>...\" to include in what will be committed)\n#\n#\t.mailmap\n\n$ git diff-files --ignore-submodules\n:100644 100644 b6ac7eb5e74d21eb7d5806f05a2ed83d6078ced3\n0000000000000000000000000000000000000000\nM\tchrome/browser/cocoa/tab_strip_controller.h\n\ngit add on the file in question resolves the problem, but shouldn't\nsaid file show up as \"unmerged\" in the output of git status?\n\nj.\n"}]}