summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Kyle Meyer <kyle@kyleam.com>2017-02-20 20:10:33 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-02-20 22:04:47 -0800
commitde922669ab0508109cdb5672e5515f7524e3ccf8 (patch)
treee2c422d531bba40feb3940d2c552ab6d4cc45e3a /builtin/merge-ours.c
parentdelete_ref: accept a reflog message argument (diff)
downloadtgif-de922669ab0508109cdb5672e5515f7524e3ccf8.tar.xz
update-ref: pass reflog message to delete_ref()
Now that delete_ref() accepts a reflog message, pass the user-provided message to delete_ref() rather than silently dropping it. Signed-off-by: Kyle Meyer <kyle@kyleam.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions