author | Junio C Hamano <gitster@pobox.com> | |
Wed, 20 Jan 2010 20:22:58 +0000 (12:22 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 20 Jan 2010 20:22:58 +0000 (12:22 -0800) | ||
commit | 806e5c8682c8621b19529c21899dcb14a1035d11 | |
tree | c1fe88e5faa88f61548393583acd89092e7521d7 | tree | snapshot |
parent | 91d23be16767bf820401a6ba9a9397aa146c977a | commit | diff |
parent | cd0f0f68e1074e684a014e1714104693097caabc | commit | diff |
Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5
* jk/maint-1.6.5-reset-hard:
reset: unbreak hard resets with GIT_WORK_TREE
* jk/maint-1.6.5-reset-hard:
reset: unbreak hard resets with GIT_WORK_TREE