[PATCH 3/7] git-mergetool: don't hardcode 'mergetool' in show_tool_help
From: David Aguilar <hidden>
Date: 2016-06-15 22:55:53
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: John Keeping <redacted>
When using show_tool_help from git-difftool we will want it to print
"git difftool" not "git mergetool" so use "git ${TOOL_MODE}tool".
Signed-off-by: John Keeping <redacted>
Signed-off-by: David Aguilar <redacted>
---
git-mergetool--lib.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 1748315..4c1e129 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh@@ -188,12 +188,14 @@ show_tool_help () { unavailable="$unavailable$i$LF" fi done + + cmd_name=${TOOL_MODE}tool if test -n "$available" then - echo "'git mergetool --tool=<tool>' may be set to one of the following:" + echo "'git $cmd_name --tool=<tool>' may be set to one of the following:" echo "$available" | sort | sed -e 's/^/ /' else - echo "No suitable tool for 'git mergetool --tool=<tool>' found." + echo "No suitable tool for 'git $cmd_name --tool=<tool>' found." fi if test -n "$unavailable" then
--
1.8.1.1.367.g22b1720.dirty