]> Pileus Git - ~andy/git/commit
projects / ~andy / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 26daa84) | patch
git-mergetool: don't hardcode 'mergetool' in show_tool_help
authorJohn Keeping <john@keeping.me.uk>
Fri, 25 Jan 2013 09:43:50 +0000 (01:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 Jan 2013 19:07:54 +0000 (11:07 -0800)
commit62b6f7e021cd5e7a7c3ee8d46ec45fe39d1bf562
treebc0fe283cac226e85c9404601d608b76e8015587tree | snapshot
parent26daa842dc35b2fe522ef18a1404c72421b3894ccommit | diff
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>
git-mergetool--lib.sh diff | blob | history
Andy's Git repository