Merge branch 'maint'
commit372c767610c4e4d7f4832d037ac51a62a59875a3
authorJunio C Hamano <gitster@pobox.com>
Sat, 2 Aug 2008 18:58:34 +0000 (2 11:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 2 Aug 2008 18:58:34 +0000 (2 11:58 -0700)
tree9e0efda79c236ceeba4b727c89b79818358034b2
parent2b603260f325b895baa20867bd45c8e251f19b78
parentb003c00b7b5e352569061fec0b1e1bd0d0fa8b6a
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
Documentation/git-name-rev.txt
builtin-name-rev.c