summaryrefslogtreecommitdiff
path: root/Documentation/git-check-attr.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-11-03 15:32:38 -0800
committerJunio C Hamano <gitster@pobox.com>2015-11-03 15:32:38 -0800
commitf5f76845961f4207b3dc8c186b2356f160276e45 (patch)
treef88d6c141e2c6040b69e015e8c9d9a37bdd80111 /Documentation/git-check-attr.txt
parent14f905caf2da593a65a2be51ff4d219e5cc3de04 (diff)
parent33e8fc87407505c3a96792fc47189d57b97b34c3 (diff)
downloadgit-f5f76845961f4207b3dc8c186b2356f160276e45.tar.gz
Merge branch 'jc/usage-stdin' into maint
The synopsis text and the usage string of subcommands that read list of things from the standard input are often shown as if they only take input from a file on a filesystem, which was misleading. * jc/usage-stdin: usage: do not insist that standard input must come from a file
Diffstat (limited to 'Documentation/git-check-attr.txt')
-rw-r--r--Documentation/git-check-attr.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt
index 00e2aa2df2..aa3b2bf2fc 100644
--- a/Documentation/git-check-attr.txt
+++ b/Documentation/git-check-attr.txt
@@ -10,7 +10,7 @@ SYNOPSIS
--------
[verse]
'git check-attr' [-a | --all | attr...] [--] pathname...
-'git check-attr' --stdin [-z] [-a | --all | attr...] < <list-of-paths>
+'git check-attr' --stdin [-z] [-a | --all | attr...]
DESCRIPTION
-----------
@@ -28,7 +28,8 @@ OPTIONS
Consider `.gitattributes` in the index only, ignoring the working tree.
--stdin::
- Read file names from stdin instead of from the command-line.
+ Read pathnames from the standard input, one per line,
+ instead of from the command-line.
-z::
The output format is modified to be machine-parseable.