Skip to content

Commit 2a34b31

Browse files
newrengitster
authored andcommitted
ls-files: add missing documentation for --resolve-undo option
ls-files' --resolve-undo option has existed ever since 9d9a2f4 ("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 ce74de9 ("ls-files: introduce "--format" option", 2022-07-23), making its omission a bit jarring. Document this option. Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c48035d commit 2a34b31

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

Documentation/git-ls-files.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ SYNOPSIS
1212
'git ls-files' [-z] [-t] [-v] [-f]
1313
[-c|--cached] [-d|--deleted] [-o|--others] [-i|--ignored]
1414
[-s|--stage] [-u|--unmerged] [-k|--killed] [-m|--modified]
15+
[--resolve-undo]
1516
[--directory [--no-empty-directory]] [--eol]
1617
[--deduplicate]
1718
[-x <pattern>|--exclude=<pattern>]
@@ -77,6 +78,13 @@ OPTIONS
7778
to file/directory conflicts for checkout-index to
7879
succeed.
7980

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+
8088
-z::
8189
\0 line termination on output and do not quote filenames.
8290
See OUTPUT below for more information.
@@ -136,6 +144,7 @@ a space) at the start of each line:
136144
C:: modified/changed
137145
K:: to be killed
138146
?:: other
147+
U:: resolve-undo
139148
--
140149

141150
-v::

0 commit comments

Comments
 (0)