summaryrefslogtreecommitdiff
path: root/server-info.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-09 20:42:10 -0700
committerJunio C Hamano <gitster@pobox.com>2010-04-09 20:42:10 -0700
commitda288e25d9e10b746cf3b311cb4503d1810cde37 (patch)
tree3fdf480d143a4d5d47b73b6cbeb16614d2be2332 /server-info.c
parent7ec1eb93f779d06efac106cd1998410932f3c9b2 (diff)
parent936db184f0b51c07aba5e6a8f79352045f887632 (diff)
downloadgit-da288e25d9e10b746cf3b311cb4503d1810cde37.tar.gz
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
Diffstat (limited to 'server-info.c')
0 files changed, 0 insertions, 0 deletions