diff options
author | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
commit | 1aa40d2e3f5186afb805e7020577acb9f5f78b89 (patch) | |
tree | 72812d480799e16b94f9cfed423b8d7d45c7fb4f /git-ls-files.txt | |
parent | a9701f0184382d8de7380c56558718915905746a (diff) | |
download | git-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz |
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'git-ls-files.txt')
-rw-r--r-- | git-ls-files.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-ls-files.txt b/git-ls-files.txt index 98f3b9e75..af409bf3b 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt @@ -146,7 +146,7 @@ which case it outputs: [<tag> ]<mode> <object> <stage> <file> -'git-ls-files --unmerged' and 'git-ls-files --stage' can be used to examine +'git ls-files --unmerged' and 'git ls-files --stage' can be used to examine detailed information on unmerged paths. For an unmerged path, instead of recording a single mode/SHA1 pair, @@ -163,7 +163,7 @@ respectively. Exclude Patterns ---------------- -'git-ls-files' can use a list of "exclude patterns" when +'git ls-files' can use a list of "exclude patterns" when traversing the directory tree and finding files to show when the flags --others or --ignored are specified. linkgit:gitignore[5] specifies the format of exclude patterns. @@ -179,7 +179,7 @@ These exclude patterns come from these places, in order: in the same order they appear in the file. 3. command line flag --exclude-per-directory=<name> specifies - a name of the file in each directory 'git-ls-files' + a name of the file in each directory 'git ls-files' examines, normally `.gitignore`. Files in deeper directories take precedence. Patterns are ordered in the same order they appear in the files. |