user/sven/git.git/git-difftool.perl, branch v1.6.4.5

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