projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add git-shortlog perl script
[git.git]
/
Documentation
/
git-ls-files.txt
diff --git
a/Documentation/git-ls-files.txt
b/Documentation/git-ls-files.txt
index
2face87
..
be83ab1
100644
(file)
--- a/
Documentation/git-ls-files.txt
+++ b/
Documentation/git-ls-files.txt
@@
-10,8
+10,8
@@
git-ls-files - Information about files in the cache/working directory
SYNOPSIS
--------
'git-ls-files' [-z] [-t]
SYNOPSIS
--------
'git-ls-files' [-z] [-t]
- (--[cached|deleted|others|ignored|stage|unmerged])\*
- (-[c|d|o|i|s|u])\*
+ (--[cached|deleted|others|ignored|stage|unmerged
|killed
])\*
+ (-[c|d|o|i|s|u
|k
])\*
[-x <pattern>|--exclude=<pattern>]
[-X <file>|--exclude-from=<file>]
[-x <pattern>|--exclude=<pattern>]
[-X <file>|--exclude-from=<file>]
@@
-45,6
+45,11
@@
OPTIONS
-u|--unmerged::
Show unmerged files in the output (forces --stage)
-u|--unmerged::
Show unmerged files in the output (forces --stage)
+-k|--killed::
+ Show files on the filesystem that need to be removed due
+ to file/directory conflicts for checkout-cache to
+ succeed.
+
-z::
\0 line termination on output
-z::
\0 line termination on output
@@
-65,6
+70,7
@@
OPTIONS
H cached
M unmerged
R removed/deleted
H cached
M unmerged
R removed/deleted
+ K to be killed
? other
Output
? other
Output
@@
-83,7
+89,9
@@
the dircache records up to three such pairs; one from tree O in stage
the user (or Cogito) to see what should eventually be recorded at the
path. (see read-cache for more information on state)
the user (or Cogito) to see what should eventually be recorded at the
path. (see read-cache for more information on state)
-see also: link:read-cache.html[read-cache]
+See Also
+--------
+link:read-cache.html[read-cache]
Author
Author