From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Jul 2013 19:04:14 +0000 (-0700)
Subject: Merge branch 'rr/name-rev-stdin-doc'
X-Git-Tag: v1.8.4-rc0~64
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/624ec4f99d8c58d17ccf5ca8d42bf329a68b731d?ds=inline;hp=-c

Merge branch 'rr/name-rev-stdin-doc'

* rr/name-rev-stdin-doc:
name-rev doc: rewrite --stdin paragraph
---

624ec4f99d8c58d17ccf5ca8d42bf329a68b731d
diff --combined Documentation/git-name-rev.txt
index 6b0f1ba75f,11da704b8d..15b00e0991
--- a/Documentation/git-name-rev.txt
+++ b/Documentation/git-name-rev.txt
@@@ -25,15 -25,16 +25,17 @@@ OPTION
  	Do not use branch names, but only tags to name the commits
  
  --refs=<pattern>::
 -	Only use refs whose names match a given shell pattern.
 +	Only use refs whose names match a given shell pattern.  The pattern
 +	can be one of branch name, tag name or fully qualified ref name.
  
  --all::
  	List all commits reachable from all refs
  
  --stdin::
- 	Read from stdin, append "(<rev_name>)" to all sha1's of nameable
- 	commits, and pass to stdout
+ 	Transform stdin by substituting all the 40-character SHA-1
+ 	hexes (say $hex) with "$hex ($rev_name)".  When used with
+ 	--name-only, substitute with "$rev_name", omitting $hex
+ 	altogether.  Intended for the scripter's use.
  
  --name-only::
  	Instead of printing both the SHA-1 and the name, print only