aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-10-19 16:06:47 -0700
committerJunio C Hamano <gitster@pobox.com>2008-10-19 16:06:47 -0700
commit6c1c3d175350e5fcd664552198f74893c5f14e86 (patch)
tree55455028db880c8161133eabb64b35e84c1aa1c4 /Documentation
parentfd6e237d4e8b07287c8349aa99e897f4eace4ff3 (diff)
parente7108fcb15fadf7042fefc54fadc930e2298a4cb (diff)
downloadgit-6c1c3d175350e5fcd664552198f74893c5f14e86.tar.gz
git-6c1c3d175350e5fcd664552198f74893c5f14e86.tar.xz
Merge branch 'dp/checkattr'
* dp/checkattr: git-check-attr(1): use 'verse' for multi-line synopsis sections check-attr: Add --stdin option check-attr: add an internal check_attr() function
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-check-attr.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt
index 4b3c2b0b0..256659a6b 100644
--- a/Documentation/git-check-attr.txt
+++ b/Documentation/git-check-attr.txt
@@ -8,7 +8,9 @@ git-check-attr - Display gitattributes information.
SYNOPSIS
--------
+[verse]
'git check-attr' attr... [--] pathname...
+'git check-attr' --stdin [-z] attr... < <list-of-paths>
DESCRIPTION
-----------
@@ -17,6 +19,13 @@ For every pathname, this command will list if each attr is 'unspecified',
OPTIONS
-------
+--stdin::
+ Read file names from stdin instead of from the command-line.
+
+-z::
+ Only meaningful with `--stdin`; paths are separated with
+ NUL character instead of LF.
+
\--::
Interpret all preceding arguments as attributes, and all following
arguments as path names. If not supplied, only the first argument will