summaryrefslogtreecommitdiff
path: root/git-status.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-07 01:26:31 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-07 01:26:31 (GMT)
commitfcbc3083e37f3c025d85d7b2c8a1c53d07a81fac (patch)
tree49ac95e5ebfd28b32ec1a23a0982900426f0c06c /git-status.sh
parent0cfddacdcca229deca9a1dcdf8628bf168171908 (diff)
downloadgit-fcbc3083e37f3c025d85d7b2c8a1c53d07a81fac.zip
git-fcbc3083e37f3c025d85d7b2c8a1c53d07a81fac.tar.gz
git-fcbc3083e37f3c025d85d7b2c8a1c53d07a81fac.tar.bz2
ls-files: --others should not say unmerged paths are unknown.
Jon Loeliger noticed that an unmerged path appears as "Untracked" in git-status output, even though we show the same path as updated/changed. Since --others means "we have not told git about that path", we should not show unmerged paths -- obviously, git knows about them; it just does not know what we want to do about them yet. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-status.sh')
0 files changed, 0 insertions, 0 deletions