summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar John Keeping <john@keeping.me.uk>2013-01-25 01:43:50 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-25 11:07:54 -0800
commit62b6f7e021cd5e7a7c3ee8d46ec45fe39d1bf562 (patch)
treebc0fe283cac226e85c9404601d608b76e8015587
parentgit-mergetool: remove redundant assignment (diff)
downloadtgif-62b6f7e021cd5e7a7c3ee8d46ec45fe39d1bf562.tar.xz
git-mergetool: don't hardcode 'mergetool' in show_tool_help
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 <john@keeping.me.uk> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--git-mergetool--lib.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 1748315bc2..4c1e1292a6 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