summaryrefslogtreecommitdiff
path: root/Documentation/git-ls-files.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-05-23 05:38:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-23 05:38:23 (GMT)
commitbe75d12982e614685f47bff67676eb69c60bf624 (patch)
treeefb123b5f950c61d594d9508c319075fcabe8cab /Documentation/git-ls-files.txt
parentfda537adbaee0bc7423c734c9c662f9f6641c5c4 (diff)
parent5356a3c3542774f05684b5c3999060492dce2e8d (diff)
downloadgit-be75d12982e614685f47bff67676eb69c60bf624.zip
git-be75d12982e614685f47bff67676eb69c60bf624.tar.gz
git-be75d12982e614685f47bff67676eb69c60bf624.tar.bz2
Merge branch 'ah/misc-doc-updates'
Misc doc fixes. * ah/misc-doc-updates: doc: normalize [--options] to [options] in git-diff doc: add note about shell quoting to revision.txt git-svn: remove ''--add-author-from' for 'commit-diff' doc: add '-d' and '-o' for 'git push' doc: clarify ignore rules for git ls-files doc: align 'diff --no-index' in text and synopsis doc: improve formatting in githooks.txt
Diffstat (limited to 'Documentation/git-ls-files.txt')
-rw-r--r--Documentation/git-ls-files.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 0f2cee7..5298f1b 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -53,7 +53,8 @@ OPTIONS
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.
+ pattern. Standard ignore rules are not automatically activated,
+ therefore at least one of the `--exclude*` options is required.
-s::
--stage::