Merge branch 'en/maint-hash-object' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Mar 2009 20:51:59 +0000 (13:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Mar 2009 20:51:59 +0000 (13:51 -0700)
commitbbc6a14b723ae831f35fc1b923fe497e7329443e
treefcc4adb16eb4b46acc810c3975dcb298cedea517
parent9a6682bab5e800465f0a4e44cdf18fe396ff4f6d
parent272459a3b809db19d15131eb5df9dfe939af9c8c
Merge branch 'en/maint-hash-object' into maint

* en/maint-hash-object:
  Ensure proper setup of git_dir for git-hash-object

Conflicts:
hash-object.c
hash-object.c