Merge branch 'en/maint-hash-object'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2009 23:58:42 +0000 (15:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2009 23:58:42 +0000 (15:58 -0800)
commit8cc3fe45c92a2e85400a6ee83c3b3a4a8ca1d6c7
treec30c346e1141d8b7aaa15f2f36349ec7e44399d1
parente46f778968d854d67596f844340dd56d5e2781f2
parent272459a3b809db19d15131eb5df9dfe939af9c8c
Merge branch 'en/maint-hash-object'

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

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