diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2015-02-08 16:01:29 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-09 14:27:28 -0800 |
| commit | a5ff11ab86dc3c67aeb7fcaaa5910ec096f068ed (patch) | |
| tree | 210e8c92e324fade4ae5c9995b39bf4df6e41dc1 | |
| parent | debce3c37a2326408e2f147ab7867f7aeb082fed (diff) | |
| download | git-a5ff11ab86dc3c67aeb7fcaaa5910ec096f068ed.tar.gz | |
list-files: -u does not imply showing stages
Showing full index entry information is something for ls-files
only. The users of "git list-files" may just want to know what entries
are not unmerged.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/ls-files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c index d55b5e73f5..c5468c754d 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -656,7 +656,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) } if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed) require_work_tree = 1; - if (show_unmerged) + if (show_unmerged && !porcelain) /* * There's no point in showing unmerged unless * you also show the stage information. |