summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-19 10:43:08 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-19 10:43:08 -0700
commit871ed7842c2cc6c73aef45e7e46dc658a8ddf973 (patch)
tree9edf72ee62ccfda557d55937e4440818ec2c0dba
parentba5831fdae3d8c87ddeed9f78f2a9ff5d0a60b62 (diff)
parent3087b615abac487a5f52d31c10bc48f2c769654b (diff)
downloadgit-871ed7842c2cc6c73aef45e7e46dc658a8ddf973.tar.gz
Merge branch 'rr/name-rev-stdin-doc' into maint
* rr/name-rev-stdin-doc: name-rev doc: rewrite --stdin paragraph
-rw-r--r--Documentation/git-name-rev.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-name-rev.txt b/Documentation/git-name-rev.txt
index ad1d1468c9..11da704b8d 100644
--- a/Documentation/git-name-rev.txt
+++ b/Documentation/git-name-rev.txt
@@ -31,8 +31,10 @@ OPTIONS
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