From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Mar 2009 23:58:42 +0000 (-0800)
Subject: Merge branch 'en/maint-hash-object'
X-Git-Tag: v1.6.3-rc0~201
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8cc3fe45c92a2e85400a6ee83c3b3a4a8ca1d6c7?hp=8cc3fe45c92a2e85400a6ee83c3b3a4a8ca1d6c7

Merge branch 'en/maint-hash-object'

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

Conflicts:
hash-object.c
---