Code

Merge branch 'jk/maint-1.6.5-reset-hard'
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Jan 2010 16:52:53 +0000 (08:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Jan 2010 16:52:53 +0000 (08:52 -0800)
commit0b4ae29f0328fb8c270030abad132e8f50e05381
tree7c95d5b74f47a5c98a35ede8498d4bdbc8b6ff02
parent84d52cabe7044786b5cc448ffeb97b7c1e667156
parentcd0f0f68e1074e684a014e1714104693097caabc
Merge branch 'jk/maint-1.6.5-reset-hard'

* jk/maint-1.6.5-reset-hard:
  reset: unbreak hard resets with GIT_WORK_TREE
builtin-reset.c