diff options
| author |  ZheNing Hu <adlternative@gmail.com> | 2021-01-23 10:20:10 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-01-23 11:48:20 -0800 |
| commit | 93a7d9835f008488080d4f61096ee4c12ae60362 (patch) | |
| tree | ebc9337488c0bc33c4e0fdf254f2fc1da58b5dad /Documentation/git-mergetool--lib.txt | |
| parent | ls_files.c: consolidate two for loops into one (diff) | |
| download | tgif-93a7d9835f008488080d4f61096ee4c12ae60362.tar.xz | |
ls-files.c: add --deduplicate option
During a merge conflict, the name of a file may appear multiple
times in "git ls-files" output, once for each stage. If you use
both `--delete` and `--modify` at the same time, the output may
mention a deleted file twice.
When none of the '-t', '-u', or '-s' options is in use, these
duplicate entries do not add much value to the output.
Introduce a new '--deduplicate' option to suppress them.
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
[jc: extended doc and rewritten commit log]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions