From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 6 Feb 2021 00:40:44 +0000 (-0800)
Subject: Merge branch 'zh/ls-files-deduplicate'
X-Git-Tag: v2.31.0-rc0~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5198426d914ae15b52f85958c224a92f48e4f95e;p=thirdparty%2Fgit.git

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
---

5198426d914ae15b52f85958c224a92f48e4f95e