From: Jari Aalto <jari.aalto@xxxxxxxxx> Signed-off-by: Jari Aalto <jari.aalto@xxxxxxxxx> --- Documentation/git-ls-files.txt | 123 ++++++++++++++++++++-------------------- 1 files changed, 62 insertions(+), 61 deletions(-) diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 86abd13..4b88940 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -30,6 +30,15 @@ shown: OPTIONS ------- + +\--:: + Do not interpret any more arguments as options. + +--abbrev[=<n>]:: + Instead of showing the full 40-byte hexadecimal object + lines, show only a partial prefix. + Non default number of digits can be specified with --abbrev=<n>. + -c:: --cached:: Show cached files in the output (default) @@ -38,53 +47,32 @@ OPTIONS --deleted:: Show deleted files in the output --m:: ---modified:: - Show modified files in the output - --o:: ---others:: - Show other (i.e. untracked) files in the output - --i:: ---ignored:: - Show only ignored files in the output. When showing files in the - index, print only those matched by an exclude pattern. When - showing "other" files, show only those matched by an exclude - pattern. - --s:: ---stage:: - Show staged contents' object name, mode bits and stage number in the output. +--debug:: + After each line that describes a file, add more data about its + cache entry. This is intended to show as much information as + possible for manual inspection; the exact format may change at + any time. --directory:: +--no-empty-directory:: If a whole directory is classified as "other", show just its name (with a trailing slash) and not its whole contents. ---no-empty-directory:: - Do not list empty directories. Has no effect without --directory. - --u:: ---unmerged:: - Show unmerged files in the output (forces --stage) + Alternatively do not list empty directories. Has no effect + without `--directory'. --k:: ---killed:: - Show files on the filesystem that need to be removed due - to file/directory conflicts for checkout-index to - succeed. - --z:: - \0 line termination on output. +--error-unmatch:: + If any <file> does not appear in the index, treat this as an + error (return 1). --x <pattern>:: --exclude=<pattern>:: +-x <pattern>:: Skip untracked files matching pattern. Note that pattern is a shell wildcard pattern. See EXCLUDE PATTERNS below for more information. --X <file>:: --exclude-from=<file>:: +-X <file>:: Read exclude patterns from <file>; 1 per line. --exclude-per-directory=<file>:: @@ -95,16 +83,36 @@ OPTIONS Add the standard git exclusions: .git/info/exclude, .gitignore in each directory, and the user's global exclusion file. ---error-unmatch:: - If any <file> does not appear in the index, treat this as an - error (return 1). +--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. ---with-tree=<tree-ish>:: - When using --error-unmatch to expand the user supplied - <file> (i.e. path pattern) arguments to paths, pretend - that paths which were removed in the index since the - named <tree-ish> are still present. Using this option - with `-s` or `-u` options does not make any sense. +-i:: +--ignored:: + Show only ignored files in the output. When showing files in the + index, print only those matched by an exclude pattern. When + showing "other" files, show only those matched by an exclude + pattern. + +-k:: +--killed:: + Show files on the filesystem that need to be removed due + to file/directory conflicts for checkout-index to + succeed. + +-m:: +--modified:: + Show modified files in the output + +-o:: +--others:: + Show other (i.e. untracked) files in the output + +-s:: +--stage:: + Show staged contents' object name, mode bits and stage number in the output. -t:: This feature is semi-deprecated. For scripting purpose, @@ -124,31 +132,24 @@ a space) at the start of each line: C:: modified/changed K:: to be killed ?:: other +-u:: +--unmerged:: + Show unmerged files in the output (forces --stage) -v:: Similar to `-t`, but use lowercase letters for files that are marked as 'assume unchanged' (see linkgit:git-update-index[1]). ---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. - ---abbrev[=<n>]:: - Instead of showing the full 40-byte hexadecimal object - lines, show only a partial prefix. - Non default number of digits can be specified with --abbrev=<n>. - ---debug:: - After each line that describes a file, add more data about its - cache entry. This is intended to show as much information as - possible for manual inspection; the exact format may change at - any time. +--with-tree=<tree-ish>:: + When using --error-unmatch to expand the user supplied + <file> (i.e. path pattern) arguments to paths, pretend + that paths which were removed in the index since the + named <tree-ish> are still present. Using this option + with `-s` or `-u` options does not make any sense. -\--:: - Do not interpret any more arguments as options. +-z:: + \0 line termination on output. <file>:: Files to show. If no files are given all files which match the other -- 1.7.2.3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html