ls-files: add missing documentation for --resolve-undo option
ls-files' --resolve-undo option has existed ever since9d9a2f4aba
("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 sincece74de931d
("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>
This commit is contained in:

committed by
Junio C Hamano

parent
c48035d29b
commit
2a34b3181d
@ -12,6 +12,7 @@ SYNOPSIS
|
|||||||
'git ls-files' [-z] [-t] [-v] [-f]
|
'git ls-files' [-z] [-t] [-v] [-f]
|
||||||
[-c|--cached] [-d|--deleted] [-o|--others] [-i|--ignored]
|
[-c|--cached] [-d|--deleted] [-o|--others] [-i|--ignored]
|
||||||
[-s|--stage] [-u|--unmerged] [-k|--killed] [-m|--modified]
|
[-s|--stage] [-u|--unmerged] [-k|--killed] [-m|--modified]
|
||||||
|
[--resolve-undo]
|
||||||
[--directory [--no-empty-directory]] [--eol]
|
[--directory [--no-empty-directory]] [--eol]
|
||||||
[--deduplicate]
|
[--deduplicate]
|
||||||
[-x <pattern>|--exclude=<pattern>]
|
[-x <pattern>|--exclude=<pattern>]
|
||||||
@ -77,6 +78,13 @@ OPTIONS
|
|||||||
to file/directory conflicts for checkout-index to
|
to file/directory conflicts for checkout-index to
|
||||||
succeed.
|
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::
|
-z::
|
||||||
\0 line termination on output and do not quote filenames.
|
\0 line termination on output and do not quote filenames.
|
||||||
See OUTPUT below for more information.
|
See OUTPUT below for more information.
|
||||||
@ -136,6 +144,7 @@ a space) at the start of each line:
|
|||||||
C:: modified/changed
|
C:: modified/changed
|
||||||
K:: to be killed
|
K:: to be killed
|
||||||
?:: other
|
?:: other
|
||||||
|
U:: resolve-undo
|
||||||
--
|
--
|
||||||
|
|
||||||
-v::
|
-v::
|
||||||
|
Reference in New Issue
Block a user