![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 Mar 2009 20:51:59 +0000 (13:51 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 Mar 2009 20:51:59 +0000 (13:51 -0700) | ||
| commit | bbc6a14b723ae831f35fc1b923fe497e7329443e | |
| tree | fcc4adb16eb4b46acc810c3975dcb298cedea517 | tree | snapshot |
| parent | 9a6682bab5e800465f0a4e44cdf18fe396ff4f6d | commit | diff |
| parent | 272459a3b809db19d15131eb5df9dfe939af9c8c | commit | diff |
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
* en/maint-hash-object:
Ensure proper setup of git_dir for git-hash-object
Conflicts:
hash-object.c
| hash-object.c | diff1 | | diff2 | | blob | history |