git/git-difftool.perl, branch v1.7.2

difftool: Fix '--gui' when diff.guitool is unconfigured

2010-03-28T16:29:12Z

When diff.guitool is unconfigured and "--gui" is specified git-difftool dies with the following error message: config diff.guitool: command returned error: 1 Catch the error so that the "--gui" flag is a no-op when diff.guitool is unconfigured. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: Add '-x' and as an alias for '--extcmd'

2010-01-15T23:04:31Z

This adds '-x' as a shorthand for the '--extcmd' option. Arguments to '--extcmd' can be specified separately, which was not originally possible. This also fixes the brief help text so that it mentions both '-x' and '--extcmd'. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: Allow specifying unconfigured commands with --extcmd

2010-01-10T06:41:30Z

git-difftool requires difftool..cmd configuration even when tools use the standard "$diffcmd $from $to" form. This teaches git-difftool to run these tools in lieu of configuration by allowing the command to be specified on the command line. Reference: http://article.gmane.org/gmane.comp.version-control.git/133377 Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

git-difftool: Add '--gui' for selecting a GUI tool

2010-01-03T08:29:35Z

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 Signed-off-by: Junio C Hamano

Explain seemingly pointless use of system in difftool

2009-04-24T08:20:35Z

Portability reasons. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano

Wait for git diff to finish in git difftool

2009-04-23T01:39:21Z

In ActivetState Perl, exec does not wait for the started program. This breaks difftool tests and may cause unexpected behaviour: git difftool has returned, but the rest of code (diff and possibly the interactive program are still running in the background. Acked-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: add support for a difftool.prompt config variable

2009-04-08T05:19:56Z

difftool now supports difftool.prompt so that users do not have to pass --no-prompt or hit enter each time a diff tool is launched. The --prompt flag overrides the configuration variable. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: move 'git-difftool' out of contrib

2009-04-08T05:19:56Z

This prepares 'git-difftool' and its documentation for mainstream use. 'git-difftool-helper' became 'git-difftool--helper' since users should not use it directly. 'git-difftool' was added to the list of commands as an ancillaryinterrogator. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano