diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-06 00:40:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-06 00:40:44 (GMT) |
| commit | 5198426d914ae15b52f85958c224a92f48e4f95e (patch) | |
| tree | 5789b6aadbff78dd54ce0cf0a6a5a37127688260 /Documentation | |
| parent | a0a2d75d3b39632a8ed9c71320c3e9e77e40946a (diff) | |
| parent | 93a7d9835f008488080d4f61096ee4c12ae60362 (diff) | |
| download | git-5198426d914ae15b52f85958c224a92f48e4f95e.zip git-5198426d914ae15b52f85958c224a92f48e4f95e.tar.gz git-5198426d914ae15b52f85958c224a92f48e4f95e.tar.bz2 | |
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 'Documentation')
| -rw-r--r-- | Documentation/git-ls-files.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 0a3b526..6d11ab5 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -13,6 +13,7 @@ SYNOPSIS (--[cached|deleted|others|ignored|stage|unmerged|killed|modified])* (-[c|d|o|i|s|u|k|m])* [--eol] + [--deduplicate] [-x <pattern>|--exclude=<pattern>] [-X <file>|--exclude-from=<file>] [--exclude-per-directory=<file>] @@ -80,6 +81,13 @@ OPTIONS \0 line termination on output and do not quote filenames. See OUTPUT below for more information. +--deduplicate:: + When only filenames are shown, suppress duplicates that may + come from having multiple stages during a merge, or giving + `--deleted` and `--modified` option at the same time. + When any of the `-t`, `--unmerged`, or `--stage` option is + in use, this option has no effect. + -x <pattern>:: --exclude=<pattern>:: Skip untracked files matching pattern. |