projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84d52ca cd0f0f6)
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)
* jk/maint-1.6.5-reset-hard:
  reset: unbreak hard resets with GIT_WORK_TREE

1  2 
builtin-reset.c patch | diff1 | diff2 | blob | history

diff --cc builtin-reset.c
Simple merge
Git—the stupid content tracker