Merge branch 'jk/reset-reflog-message-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2011 05:33:20 +0000 (22:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2011 05:33:20 +0000 (22:33 -0700)
* jk/reset-reflog-message-fix:
  reset: give better reflog messages

1  2 
builtin/reset.c

diff --cc builtin/reset.c
Simple merge