From: Denton Liu <liu.denton@gmail.com>
Date: Wed, 24 Oct 2018 05:58:14 GMT
Subject: [PATCH v2 2/2] completion: support `git mergetool --[no-]gui`
Message-ID: <e0b0585a17bb0b3f43fd930b449b9bc631d58f0f.1540360514.git.liu.denton@gmail.com>
In-Reply-To: <xmqqy3aond55.fsf@gitster-ct.c.googlers.com>

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>
---
 contrib/completion/git-completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index db7fd87b6..a45b4a050 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
-- 
2.19.1