X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-ls-files.txt;h=e813f8420275f5b95810646c2a43c35f57a5ba70;hb=f84a2b1cad40a2b4ecb1dd842da24dda58c57b69;hp=186f3bb57a6d77da9705860d730cf8cd3c9d867f;hpb=1a4e841b439ba014b365999c3a6b9e2be3740bd8;p=git.git diff --git a/git-ls-files.txt b/git-ls-files.txt index 186f3bb5..e813f842 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt @@ -8,12 +8,14 @@ git-ls-files - Information about files in the index/working directory 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 |--exclude=] [-X |--exclude-from=] [--exclude-per-directory=] + [--error-unmatch] [--full-name] [--] []\* DESCRIPTION @@ -46,6 +48,10 @@ OPTIONS -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) @@ -68,15 +74,23 @@ OPTIONS read additional exclude patterns that apply only to the directory and its subdirectories in . +--error-unmatch:: + If any does not appear in the index, treat this as an + error (return 1). + -t:: Identify the file status with the following tags (followed by a space) at the start of each line: H:: cached M:: unmerged R:: removed/deleted - C:: modifed/changed + 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