diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-15 23:07:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 23:07:32 -0800 |
| commit | 958742ba43a0e3847cc7095869f0d96febe47132 (patch) | |
| tree | a1617297d94ecff73a737dcb333b6996be7cb8da /Documentation | |
| parent | 3e606ea7ca432c084677ecd52d64650cceef2e77 (diff) | |
| parent | 500348aa6859e436a890f5f5a7e0eeea8ef6c1de (diff) | |
| download | git-958742ba43a0e3847cc7095869f0d96febe47132.tar.gz git-958742ba43a0e3847cc7095869f0d96febe47132.tar.xz | |
Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
* jk/maint-1.6.3-ls-files-i:
ls-files: unbreak "ls-files -i"
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-ls-files.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 021066e95..625723e41 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -48,8 +48,10 @@ OPTIONS -i:: --ignored:: - Show ignored files in the output. - Note that this also reverses any exclude list present. + 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:: |