aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-12 12:04:14 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-12 12:04:14 -0700
commit624ec4f99d8c58d17ccf5ca8d42bf329a68b731d (patch)
treec74212f4370b2a1a316808c0f285bdd1658d2b94
parent6492deafdd895cbf19034211dceeddce0337669c (diff)
parent3087b615abac487a5f52d31c10bc48f2c769654b (diff)
downloadgit-624ec4f99d8c58d17ccf5ca8d42bf329a68b731d.tar.gz
git-624ec4f99d8c58d17ccf5ca8d42bf329a68b731d.tar.xz
Merge branch 'rr/name-rev-stdin-doc'
* 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 6b0f1ba75..15b00e099 100644
--- a/Documentation/git-name-rev.txt
+++ b/Documentation/git-name-rev.txt
@@ -32,8 +32,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