threads / discuss / 18797

"git status <file>" in the middle of a merge

Subject: "git status <file>" in the middle of a merge

## tl;dr

2 messages between Apr 8, 2009 and Apr 8, 2009.

replies: 1people: 2as markdown or json

layer· Apr 8, 2009, 23:40 UTC · lore

$ 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'.
Markus Heidelberg· Apr 8, 2009, 23:47 UTC · re: layer · lore

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

← back to recent threads