diff options
| author | David Aguilar <davvid@gmail.com> | 2009-12-22 21:27:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-03 00:29:35 -0800 |
| commit | 4cefa495ca91ad833084ebf3f73c77997920ae9b (patch) | |
| tree | 6ee3a42ff6cf26d688a82e1d494c11a0d9c9fdef /builtin-merge-file.c | |
| parent | 23218bbd2ea7f919b93245489e544a55165ec466 (diff) | |
| download | git-4cefa495ca91ad833084ebf3f73c77997920ae9b.tar.gz git-4cefa495ca91ad833084ebf3f73c77997920ae9b.tar.xz | |
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 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions