Merge branch 'maint'
commit2fe18392f0355c80295b8b74b24fc817183d3752
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 May 2008 02:49:01 +0000 (26 19:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 May 2008 02:49:01 +0000 (26 19:49 -0700)
tree46feb2f65ad4589475ff946bb34b8abd4a5a928d
parent2d3cfd77ad5305c132f7b23c192ae6c327443c95
parent109440c1bf2a3015cd9253515f07231c4cf9d65a
Merge branch 'maint'

* maint:
  Documentation: fix graph in git-rev-parse.txt
  show-branch --current: do not barf on detached HEAD
Documentation/git-rev-parse.txt
builtin-show-branch.c