Merge branch 'maint-1.5.4' into maintv1.5.5.2
commit77599cc0bbd0a08defc3bfa80ca52d931d8dc786
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 May 2008 22:52:43 +0000 (23 15:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 May 2008 22:52:43 +0000 (23 15:52 -0700)
tree836bbf7742605d6fdccf849bb93919a1db73475b
parent26b4d0039d84010bbfab2148395cc86f87b91286
parente00f3790b88ce61f1bdc863011a122b98b43197e
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
builtin-rev-parse.c