projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
diff-tree -c: show a merge commit a bit more sensibly.
[git.git]
/
Documentation
/
git-ls-files.txt
diff --git
a/Documentation/git-ls-files.txt
b/Documentation/git-ls-files.txt
index
8c1784d
..
e433407
100644
(file)
--- a/
Documentation/git-ls-files.txt
+++ b/
Documentation/git-ls-files.txt
@@
-3,7
+3,7
@@
git-ls-files(1)
NAME
----
NAME
----
-git-ls-files - Information about files in the
cache
/working directory
+git-ls-files - Information about files in the
index
/working directory
SYNOPSIS
SYNOPSIS
@@
-13,7
+13,8
@@
SYNOPSIS
(-[c|d|o|i|s|u|k|m])\*
[-x <pattern>|--exclude=<pattern>]
[-X <file>|--exclude-from=<file>]
(-[c|d|o|i|s|u|k|m])\*
[-x <pattern>|--exclude=<pattern>]
[-X <file>|--exclude-from=<file>]
- [--exclude-per-directory=<file>] [--] [<file>]\*
+ [--exclude-per-directory=<file>]
+ [--full-name] [--] [<file>]\*
DESCRIPTION
-----------
DESCRIPTION
-----------
@@
-45,6
+46,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)
@@
-73,10
+78,16
@@
OPTIONS
H:: cached
M:: unmerged
R:: removed/deleted
H:: cached
M:: unmerged
R:: removed/deleted
- C:: modifed/changed
+ C:: modif
i
ed/changed
K:: to be killed
? other
K:: to be killed
? other
+--full-name::
+ When run from a subdirectory, the command usually
+ outputs paths relative to the current directory. This
+ option forces paths to be output relative to the project
+ top directory.
+
--::
Do not interpret any more arguments as options.
--::
Do not interpret any more arguments as options.