summaryrefslogtreecommitdiff
path: root/git-difftool--helper.sh
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2009-12-23 05:27:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-03 08:29:35 (GMT)
commit4cefa495ca91ad833084ebf3f73c77997920ae9b (patch)
tree6ee3a42ff6cf26d688a82e1d494c11a0d9c9fdef /git-difftool--helper.sh
parent23218bbd2ea7f919b93245489e544a55165ec466 (diff)
downloadgit-4cefa495ca91ad833084ebf3f73c77997920ae9b.zip
git-4cefa495ca91ad833084ebf3f73c77997920ae9b.tar.gz
git-4cefa495ca91ad833084ebf3f73c77997920ae9b.tar.bz2
git-difftool: Add '--gui' for selecting a GUI tool
Users might prefer to have git-difftool use a different tool when run from a Git GUI. This teaches git-difftool to honor 'diff.guitool' when the '--gui' option is specified. This allows users to configure their preferred command-line diff tool in 'diff.tool' and a GUI diff tool in 'diff.guitool'. Reference: http://article.gmane.org/gmane.comp.version-control.git/133386 Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-difftool--helper.sh')
0 files changed, 0 insertions, 0 deletions