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>
Elijah Newren committed
Jan 13, 2023 at 04:41 UTC
2a34b3181dba0d2049dff127ee70aca0c255a7ad
1 file changed
+9
Documentation/git-ls-files.txt
+9
@@ -12,6 +12,7 @@ SYNOPSIS
12
'git ls-files' [-z] [-t] [-v] [-f]
13
[-c|--cached] [-d|--deleted] [-o|--others] [-i|--ignored]
14
[-s|--stage] [-u|--unmerged] [-k|--killed] [-m|--modified]
15
+ [--resolve-undo]
16
[--directory [--no-empty-directory]] [--eol]
17
[--deduplicate]
18
[-x <pattern>|--exclude=<pattern>]
@@ -77,6 +78,13 @@ OPTIONS
78
to file/directory conflicts for checkout-index to
79
succeed.
80
81
+--resolve-undo::
82
+ Show files having resolve-undo information in the index
83
+ together with their resolve-undo information. (resolve-undo
84
+ information is what is used to implement "git checkout -m
85
+ $PATH", i.e. to recreate merge conflicts that were
86
+ accidentally resolved)
87
+
88
-z::
89
\0 line termination on output and do not quote filenames.
90
See OUTPUT below for more information.
@@ -136,6 +144,7 @@ a space) at the start of each line:
144
C:: modified/changed
145
K:: to be killed
146
?:: other
147
+ U:: resolve-undo
148
--
149
150
-v::