From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 Oct 2008 23:06:47 +0000 (-0700)
Subject: Merge branch 'dp/checkattr'
X-Git-Tag: v1.6.1-rc1~130
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6c1c3d175350e5fcd664552198f74893c5f14e86?ds=inline;hp=-c

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
---

6c1c3d175350e5fcd664552198f74893c5f14e86
diff --combined Documentation/git-check-attr.txt
index 4b3c2b0b06,174b088bcd..256659a6b0
--- a/Documentation/git-check-attr.txt
+++ b/Documentation/git-check-attr.txt
@@@ -8,7 -8,9 +8,9 @@@ git-check-attr - Display gitattributes 
  
  SYNOPSIS
  --------
+ [verse]
  'git check-attr' attr... [--] pathname...
+ 'git check-attr' --stdin [-z] attr... < <list-of-paths>
  
  DESCRIPTION
  -----------
@@@ -17,61 -19,18 +19,68 @@@ For every pathname, this command will l
  
  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
  	be treated as an attribute.
  
 +OUTPUT
 +------
 +
 +The output is of the form:
 +<path> COLON SP <attribute> COLON SP <info> LF
 +
 +Where <path> is the path of a file being queried, <attribute> is an attribute
 +being queried and <info> can be either:
 +
 +'unspecified';; when the attribute is not defined for the path.
 +'unset';;	when the attribute is defined to false.
 +'set';;		when the attribute is defined to true.
 +<value>;;	when a value has been assigned to the attribute.
 +
 +EXAMPLES
 +--------
 +
 +In the examples, the following '.gitattributes' file is used:
 +---------------
 +*.java diff=java -crlf myAttr
 +NoMyAttr.java !myAttr
 +README caveat=unspecified
 +---------------
 +
 +* Listing a single attribute:
 +---------------
 +$ git check-attr diff org/example/MyClass.java
 +org/example/MyClass.java: diff: java
 +---------------
 +
 +* Listing multiple attributes for a file:
 +---------------
 +$ git check-attr crlf diff myAttr -- org/example/MyClass.java
 +org/example/MyClass.java: crlf: unset
 +org/example/MyClass.java: diff: java
 +org/example/MyClass.java: myAttr: set
 +---------------
 +
 +* Listing attribute for multiple files:
 +---------------
 +$ git check-attr myAttr -- org/example/MyClass.java org/example/NoMyAttr.java
 +org/example/MyClass.java: myAttr: set
 +org/example/NoMyAttr.java: myAttr: unspecified
 +---------------
 +
 +* Not all values are equally unambiguous:
 +---------------
 +$ git check-attr caveat README
 +README: caveat: unspecified
 +---------------
  
  SEE ALSO
  --------