From: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Fri, 22 Nov 2024 19:50:18 +0000 (+0000)
Subject: completion: complete '--tool-help' in 'git mergetool'
X-Git-Tag: v2.48.0-rc0~22^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe99a52225d56af16d283c769f14957d3c002471;p=thirdparty%2Fgit.git

completion: complete '--tool-help' in 'git mergetool'

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.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 3d4dff3185..b3b6aa3bae 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2331,7 +2331,7 @@ _git_mergetool ()
 		return
 		;;
 	--*)
-		__gitcomp "--tool= --prompt --no-prompt --gui --no-gui"
+		__gitcomp "--tool= --tool-help --prompt --no-prompt --gui --no-gui"
 		return
 		;;
 	esac