summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2011-04-01 11:20:33 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-01 14:42:31 -0700
commit4b56cf58a9ee684d47e01d815eccd75252d61da5 (patch)
treeb1906e020252b7f249b0e8bb9ff9fc091058a531 /builtin/merge-ours.c
parentt/t1411: test reflog with formats (diff)
downloadtgif-4b56cf58a9ee684d47e01d815eccd75252d61da5.tar.xz
reflog: fix overriding of command line options
Currently, "git reflog" overrides some command line options such as "--format". Fix this by using the new 2-phase version of cmd_log_init(). Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions