| commit | 5198426d914ae15b52f85958c224a92f48e4f95e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 6 Feb 2021 00:40:44 +0000 (5 16:40 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 6 Feb 2021 00:40:44 +0000 (5 16:40 -0800) | ||
| tree | 5789b6aadbff78dd54ce0cf0a6a5a37127688260 | treesnapshot (tar.gz zip) |
| parent | a0a2d75d3b39632a8ed9c71320c3e9e77e40946a | commitdiff |
| parent | 93a7d9835f008488080d4f61096ee4c12ae60362 | commitdiff |
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
"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