![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | David Aguilar <davvid@gmail.com> | |
| Wed, 23 Dec 2009 05:27:14 +0000 (21:27 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 3 Jan 2010 08:29:35 +0000 (00:29 -0800) | ||
| commit | 4cefa495ca91ad833084ebf3f73c77997920ae9b | |
| tree | 6ee3a42ff6cf26d688a82e1d494c11a0d9c9fdef | tree | snapshot |
| parent | 23218bbd2ea7f919b93245489e544a55165ec466 | commit | diff |
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>
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>
| Documentation/git-difftool.txt | diff | blob | history | |
| git-difftool.perl | diff | blob | history | |
| t/t7800-difftool.sh | diff | blob | history |