projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jc/merge-msg' into next
[git.git]
/
Documentation
/
git-ls-files.txt
diff --git
a/Documentation/git-ls-files.txt
b/Documentation/git-ls-files.txt
index
e42af5e
..
fe8ac1b
100644
(file)
--- a/
Documentation/git-ls-files.txt
+++ b/
Documentation/git-ls-files.txt
@@
-8,7
+8,8
@@
git-ls-files - Information about files in the index/working directory
SYNOPSIS
--------
SYNOPSIS
--------
-'git-ls-files' [-z] [-t]
+[verse]
+'git-ls-files' [-z] [-t] [-v]
(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])\*
(-[c|d|o|i|s|u|k|m])\*
[-x <pattern>|--exclude=<pattern>]
(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])\*
(-[c|d|o|i|s|u|k|m])\*
[-x <pattern>|--exclude=<pattern>]
@@
-46,6
+47,10
@@
OPTIONS
-s|--stage::
Show stage files in the output
-s|--stage::
Show stage files in the output
+--directory::
+ If a whole directory is classified as "other", show just its
+ name (with a trailing slash) and not its whole contents.
+
-u|--unmerged::
Show unmerged files in the output (forces --stage)
-u|--unmerged::
Show unmerged files in the output (forces --stage)
@@
-76,7
+81,11
@@
OPTIONS
R:: removed/deleted
C:: modified/changed
K:: to be killed
R:: removed/deleted
C:: modified/changed
K:: to be killed
- ? other
+ ?:: other
+
+-v::
+ Similar to `-t`, but use lowercase letters for files
+ that are marked as 'always matching index'.
--full-name::
When run from a subdirectory, the command usually
--full-name::
When run from a subdirectory, the command usually