| commit | f1790448628262e46496861bb6da76be63a2a247 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 7 Nov 2005 01:37:40 +0000 (6 17:37 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 7 Nov 2005 01:37:40 +0000 (6 17:37 -0800) | ||
| tree | 2ea0c04cd3b2ff765774a08c68f856fd73002b14 | treesnapshot (tar.gz zip) |
| parent | fcbc3083e37f3c025d85d7b2c8a1c53d07a81fac | commitdiff |
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>
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 | diffblobblamehistory |