projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fcbc308) | patch
git-status: do not mark unmerged paths as committable.
authorJunio C Hamano <junkio@cox.net>
Mon, 7 Nov 2005 01:37:40 +0000 (17:37 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 7 Nov 2005 01:37:40 +0000 (17:37 -0800)
commitf1790448628262e46496861bb6da76be63a2a247
tree2ea0c04cd3b2ff765774a08c68f856fd73002b14tree | snapshot
parentfcbc3083e37f3c025d85d7b2c8a1c53d07a81faccommit | diff
git-status: do not mark unmerged paths as committable.

An unmerged path appears as both "Updated but not checked in" list,
and "Changed but not updated" list.  We are not going to commit that
path until it is resolved, so remove it from the former list.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-status.sh diff | blob | history
The core git plumbing