completion: support `git mergetool --[no-]gui`
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Oct 24, 2018 at 12:25 UTC
57ba181270e07ba66c55c9af466e95ab9f739680
1 file changed
+1
-1
contrib/completion/git-completion.bash
+1
-1
@@ -1833,7 +1833,7 @@ _git_mergetool ()
1833
return
1834
;;
1835
--*)
1836
- __gitcomp "--tool= --prompt --no-prompt"
1836
+ __gitcomp "--tool= --prompt --no-prompt --gui --no-gui"
1837
return
1838
;;
1839
esac