summaryrefslogtreecommitdiff
path: root/Documentation/howto
diff options
context:
space:
mode:
authorLibravatar Denton Liu <liu.denton@gmail.com>2018-10-24 12:25:31 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-25 14:01:10 +0900
commit063f2bdbf767dd24bc0a35b5476d8025ee8646c7 (patch)
tree98d9c98da418e0193b7c541b191af809529e9264 /Documentation/howto
parentFifth batch for 2.20 (diff)
downloadtgif-063f2bdbf767dd24bc0a35b5476d8025ee8646c7.tar.xz
mergetool: accept -g/--[no-]gui as arguments
In line with how difftool accepts a -g/--[no-]gui option, make mergetool accept the same option in order to use the `merge.guitool` variable to find the default mergetool instead of `merge.tool`. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Anmol Mago <anmolmago@gmail.com> Signed-off-by: Brian Ho <briankyho@gmail.com> Signed-off-by: David Lu <david.lu97@outlook.com> Signed-off-by: Ryan Wang <shirui.wang@hotmail.com> Acked-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto')
0 files changed, 0 insertions, 0 deletions