Merge branch 'rc/maint-reflog-msg-for-forced-branch'
commitda288e25d9e10b746cf3b311cb4503d1810cde37
authorJunio C Hamano <gitster@pobox.com>
Sat, 10 Apr 2010 03:42:10 +0000 (9 20:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 10 Apr 2010 03:42:10 +0000 (9 20:42 -0700)
tree3fdf480d143a4d5d47b73b6cbeb16614d2be2332
parent7ec1eb93f779d06efac106cd1998410932f3c9b2
parent936db184f0b51c07aba5e6a8f79352045f887632
Merge branch 'rc/maint-reflog-msg-for-forced-branch'

* rc/maint-reflog-msg-for-forced-branch:
  branch: say "Reset to" in reflog entries for 'git branch -f' operations

Conflicts:
builtin-branch.c
branch.c