summaryrefslogtreecommitdiff
path: root/Documentation/git-ls-files.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-11-15 23:07:32 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-15 23:07:32 -0800
commit958742ba43a0e3847cc7095869f0d96febe47132 (patch)
treea1617297d94ecff73a737dcb333b6996be7cb8da /Documentation/git-ls-files.txt
parentMerge branch 'vl/maint-openssl-signature-change' into maint (diff)
parentls-files: unbreak "ls-files -i" (diff)
downloadtgif-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/git-ls-files.txt')
-rw-r--r--Documentation/git-ls-files.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 021066e95d..625723e41f 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::