diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:40:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:40:44 -0800 |
| commit | 5198426d914ae15b52f85958c224a92f48e4f95e (patch) | |
| tree | 5789b6aadbff78dd54ce0cf0a6a5a37127688260 /t/t1601-index-bogus.sh | |
| parent | Merge branch 'ds/cache-tree-basics' (diff) | |
| parent | ls-files.c: add --deduplicate option (diff) | |
| download | tgif-5198426d914ae15b52f85958c224a92f48e4f95e.tar.xz | |
Merge branch 'zh/ls-files-deduplicate'
"git ls-files" can and does show multiple entries when the index is
unmerged, which is a source for confusion unless -s/-u option is in
use. A new option --deduplicate has been introduced.
* zh/ls-files-deduplicate:
ls-files.c: add --deduplicate option
ls_files.c: consolidate two for loops into one
ls_files.c: bugfix for --deleted and --modified
Diffstat (limited to 't/t1601-index-bogus.sh')
0 files changed, 0 insertions, 0 deletions