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

diff --cc Documentation/git-name-rev.txt
index 6e77ab135353aaf713b638a70701717db1706c2c,83d8e4a9fc9757d9c666c3c122978747506b7d6e..abd2237e51dfd86bcea98320edfff8922bc04eb6
--- 1/Documentation/git-name-rev.txt
--- 2/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,

diff --cc builtin-name-rev.c
Simple merge