git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 62b6f7e)
git-difftool: use git-mergetool--lib for "--tool-help"
authorJohn Keeping <redacted>
Fri, 25 Jan 2013 09:43:51 +0000 (01:43 -0800)
committerJunio C Hamano <redacted>
Fri, 25 Jan 2013 19:08:55 +0000 (11:08 -0800)
commitabaf175cdf85ab0eb8bedd7d84ea8b42b6b3dd01
treec366e68ea87cd8d97564b5390f5fa3f5d68f286ctree | snapshot
parent62b6f7e021cd5e7a7c3ee8d46ec45fe39d1bf562commit | diff
git-difftool: use git-mergetool--lib for "--tool-help"

The "--tool-help" option to git-difftool currently displays incorrect
output since it uses the names of the files in
"$GIT_EXEC_PATH/mergetools/" rather than the list of command names in
git-mergetool--lib.

Fix this by simply delegating the "--tool-help" argument to the
show_tool_help function in git-mergetool--lib.

Signed-off-by: John Keeping <redacted>
Signed-off-by: David Aguilar <redacted>
Signed-off-by: Junio C Hamano <redacted>
git-difftool.perl diff | blob | history
git clone https://git.99rst.org/PROJECT