Merge branch 'master' into next
commitfab94c689950d1c5318101e0be0179d4109ff9b2
authorJunio C Hamano <gitster@pobox.com>
Sat, 10 Apr 2010 05:45:51 +0000 (9 22:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 10 Apr 2010 05:45:51 +0000 (9 22:45 -0700)
treee05953c9b838e9a06107e79e9a71036d28cbfb75
parent68fee56ab90dceab7408c480abf8d2f385d14783
parent3b0c19663e7976cd32188b42e762c980d1bb93d4
Merge branch 'master' into next

* master:
  Let check_preimage() use memset() to initialize "struct checkout"
  fetch/push: fix usage strings
  branch: say "Reset to" in reflog entries for 'git branch -f' operations
builtin/apply.c