* "git status <file>" in the middle of a merge
@ 2009-04-08 23:40 layer
2009-04-08 23:47 ` Markus Heidelberg
0 siblings, 1 reply; 2+ messages in thread
From: layer @ 2009-04-08 23:40 UTC (permalink / raw)
To: git
$ 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'.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: "git status <file>" in the middle of a merge
2009-04-08 23:40 "git status <file>" in the middle of a merge layer
@ 2009-04-08 23:47 ` Markus Heidelberg
0 siblings, 0 replies; 2+ messages in thread
From: Markus Heidelberg @ 2009-04-08 23:47 UTC (permalink / raw)
To: layer; +Cc: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-04-08 23:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-08 23:40 "git status <file>" in the middle of a merge layer
2009-04-08 23:47 ` Markus Heidelberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox