summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2011-08-04 06:36:32 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-04 15:53:20 -0700
commitca64d061e0ddf7fa1496a15c75eb5e730c4360e0 (patch)
tree4689979dd59781cad786e105c6ae71bf688e6542 /Documentation
parentgit-check-attr: Drive two tests using the same raw data (diff)
downloadtgif-ca64d061e0ddf7fa1496a15c75eb5e730c4360e0.tar.xz
git-check-attr: Fix command-line handling to match docs
According to the git-check-attr synopsis, if the '--stdin' option is used then no pathnames are expected on the command line. Change the behavior to match this description; namely, if '--stdin' is used but not '--', then treat all command-line arguments as attribute names. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-check-attr.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt
index 798e5d5b4f..1f7312a189 100644
--- a/Documentation/git-check-attr.txt
+++ b/Documentation/git-check-attr.txt
@@ -33,8 +33,11 @@ OPTIONS
\--::
Interpret all preceding arguments as attributes and all following
- arguments as path names. If not supplied, only the first argument will
- be treated as an attribute.
+ arguments as path names.
+
+If none of `--stdin`, `--all`, or `--` is used, the first argument
+will be treated as an attribute and the rest of the arguments as
+pathnames.
OUTPUT
------