tree c1fe88e5faa88f61548393583acd89092e7521d7
parent 91d23be16767bf820401a6ba9a9397aa146c977a
parent cd0f0f68e1074e684a014e1714104693097caabc
author Junio C Hamano <gitster@pobox.com> 1264018978 -0800
committer Junio C Hamano <gitster@pobox.com> 1264018978 -0800

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