Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 20:22:58 +0000 (12:22 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 20:22:58 +0000 (12:22 -0800)
* jk/maint-1.6.5-reset-hard:
  reset: unbreak hard resets with GIT_WORK_TREE


Trivial merge