ls-files: add missing documentation for --resolve-undo option

ls-files' --resolve-undo option has existed ever since 9d9a2f4aba
("resolve-undo: basic tests", 2009-12-25), but was never documented.
However, the option has been referred to in the ls-files manual itself
ever since ce74de931d ("ls-files: introduce "--format" option",
2022-07-23), making its omission a bit jarring.  Document this option.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 440043cdb8e4da5908c4378b2d90e8da3b14c956..cb071583f8b5f8b66bf3b488928e1ce95af9af8a 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -12,6 +12,7 @@ SYNOPSIS
 'git ls-files' [-z] [-t] [-v] [-f]
                [-c|--cached] [-d|--deleted] [-o|--others] [-i|--ignored]
                [-s|--stage] [-u|--unmerged] [-k|--killed] [-m|--modified]
+               [--resolve-undo]
                [--directory [--no-empty-directory]] [--eol]
                [--deduplicate]
                [-x <pattern>|--exclude=<pattern>]
@@ -77,6 +78,13 @@ OPTIONS
        to file/directory conflicts for checkout-index to
        succeed.
 
+--resolve-undo::
+       Show files having resolve-undo information in the index
+       together with their resolve-undo information.  (resolve-undo
+       information is what is used to implement "git checkout -m
+       $PATH", i.e. to recreate merge conflicts that were
+       accidentally resolved)
+
 -z::
        \0 line termination on output and do not quote filenames.
        See OUTPUT below for more information.
@@ -136,6 +144,7 @@ a space) at the start of each line:
        C::     modified/changed
        K::     to be killed
        ?::     other
+       U::     resolve-undo
 --
 
 -v::