git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c4df23f)
mergetool: accept -g/--[no-]gui as arguments
authorDenton Liu <redacted>
Wed, 24 Oct 2018 16:25:31 +0000 (12:25 -0400)
committerJunio C Hamano <redacted>
Thu, 25 Oct 2018 05:01:10 +0000 (14:01 +0900)
commit063f2bdbf767dd24bc0a35b5476d8025ee8646c7
tree98d9c98da418e0193b7c541b191af809529e9264tree | snapshot
parentc4df23f7927d8d00e666a3c8d1b3375f1dc8a3c1commit | diff
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 <redacted>
Signed-off-by: Anmol Mago <redacted>
Signed-off-by: Brian Ho <redacted>
Signed-off-by: David Lu <redacted>
Signed-off-by: Ryan Wang <redacted>
Acked-by: David Aguilar <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/git-mergetool.txt diff | blob | history
git-mergetool--lib.sh diff | blob | history
git-mergetool.sh diff | blob | history
git clone https://git.99rst.org/PROJECT