diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-07 01:26:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-07 01:26:31 (GMT) |
| commit | fcbc3083e37f3c025d85d7b2c8a1c53d07a81fac (patch) | |
| tree | 49ac95e5ebfd28b32ec1a23a0982900426f0c06c /apply.c | |
| parent | 0cfddacdcca229deca9a1dcdf8628bf168171908 (diff) | |
| download | git-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 'apply.c')
0 files changed, 0 insertions, 0 deletions