diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-11-10 12:33:28 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-11-10 12:33:28 -0800 |
commit | 92396402e2d547f8805dc24db53a4c725796810e (patch) | |
tree | 2a9b3ba432b6e21d588f05f29cbfeb997030a7a3 /Documentation/git-ls-files.txt | |
parent | 3cc335181fdeba6cb25e9a6e55217b2e8d18e6b1 (diff) | |
parent | 500348aa6859e436a890f5f5a7e0eeea8ef6c1de (diff) | |
download | git-92396402e2d547f8805dc24db53a4c725796810e.tar.gz git-92396402e2d547f8805dc24db53a4c725796810e.tar.xz |
Merge branch 'jk/maint-1.6.3-ls-files-i'
* 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.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:: |