$ git status ChangeLog fatal: cannot do a partial commit during a merge. $
Huh? I'm not committing. I'm asking for status.
Doing "git status" will tell me it's `unmerged'.
threads / discuss / 18797
Subject: "git status <file>" in the middle of a merge
$ git status ChangeLog fatal: cannot do a partial commit during a merge. $
Huh? I'm not committing. I'm asking for status.
Doing "git status" will tell me it's `unmerged'.
Re: "git status <file>" in the middle of a merge
layer, 09.04.2009:
> $ git status ChangeLog
This does not what you expect, see git-status doc:
The command takes the same set of options as git-commit; it shows
what would be committed if the same options are given to git-commit.Markus