summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-05 19:36:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-05 19:36:27 (GMT)
commit83d6b33db649f8e0eb96c12e61f518ddfbdfa6f5 (patch)
tree33ef96661bd58abbec792da63410e10b2b3b23a6 /Documentation
parent18445fdfd3bba554602f28c7f2cfb83f8462e8c9 (diff)
parent78cec75747995a8613a8f27625aeaa4ec4b19651 (diff)
downloadgit-83d6b33db649f8e0eb96c12e61f518ddfbdfa6f5.zip
git-83d6b33db649f8e0eb96c12e61f518ddfbdfa6f5.tar.gz
git-83d6b33db649f8e0eb96c12e61f518ddfbdfa6f5.tar.bz2
Merge branch 'js/check-attr-cached'
* js/check-attr-cached: t0003: remove extra whitespaces Teach '--cached' option to check-attr
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-check-attr.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt
index 1f7312a..5abdbaa 100644
--- a/Documentation/git-check-attr.txt
+++ b/Documentation/git-check-attr.txt
@@ -24,6 +24,9 @@ OPTIONS
paths. If this option is used, then 'unspecified' attributes
will not be included in the output.
+--cached::
+ Consider `.gitattributes` in the index only, ignoring the working tree.
+
--stdin::
Read file names from stdin instead of from the command-line.