From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 2 Aug 2008 18:58:34 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.0-rc2~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=372c767610c4e4d7f4832d037ac51a62a59875a3;p=git.git

Merge branch 'maint'

* maint:
  git-name-rev: allow --name-only in combination with --stdin
  builtin-name-rev.c: split deeply nested part from the main function

Conflicts:
	Documentation/git-name-rev.txt
---

372c767610c4e4d7f4832d037ac51a62a59875a3
diff --cc Documentation/git-name-rev.txt
index 6e77ab135,83d8e4a9f..abd2237e5
--- a/Documentation/git-name-rev.txt
+++ b/Documentation/git-name-rev.txt
@@@ -38,8 -38,7 +38,7 @@@ OPTION
  	Instead of printing both the SHA-1 and the name, print only
  	the name.  If given with --tags the usual tag prefix of
  	"tags/" is also omitted from the name, matching the output
- 	of 'git-describe' more closely.  This option
- 	cannot be combined with --stdin.
 -	of linkgit:git-describe[1] more closely.
++	of `git-describe` more closely.
  
  --no-undefined::
  	Die with error code != 0 when a reference is undefined,