From: Denton Liu <liu.denton@gmail.com>
Date: Wed, 24 Oct 2018 16:25:37 +0000 (-0400)
Subject: completion: support `git mergetool --[no-]gui`
X-Git-Tag: v2.20.0-rc0~100^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/57ba181270e07ba66c55c9af466e95ab9f739680

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>
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index db7fd87b6b..a45b4a0508 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1833,7 +1833,7 @@ _git_mergetool ()
 		return
 		;;
 	--*)
-		__gitcomp "--tool= --prompt --no-prompt"
+		__gitcomp "--tool= --prompt --no-prompt --gui --no-gui"
 		return
 		;;
 	esac