kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
John Keeping 2013-01-25 01:43:50 -08:00 committed by Junio C Hamano
parent 26daa842dc
commit 62b6f7e021
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-mergetool--lib.sh
View File

@ -188,12 +188,14 @@ show_tool_help () {
unavailable="$unavailable$i$LF" unavailable="$unavailable$i$LF"
fi fi
done done

cmd_name=${TOOL_MODE}tool
if test -n "$available" if test -n "$available"
then 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/^/ /' echo "$available" | sort | sed -e 's/^/ /'
else else
echo "No suitable tool for 'git mergetool --tool=<tool>' found." echo "No suitable tool for 'git $cmd_name --tool=<tool>' found."
fi fi
if test -n "$unavailable" if test -n "$unavailable"
then then