kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
18,434 Commits
6 Branches
976 Tags
212 MiB
Commit Graph

3 Commits (e8d1180467da98c53663e462800f793d2341f5a1)

Author SHA1 Message Date
Alex Riesen e8d1180467 Wait for git diff to finish in git difftool 
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 <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-04-22 18:39:21 -07:00
David Aguilar a904392eae difftool: add support for a difftool.prompt config variable 
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 <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-04-07 22:19:56 -07:00
David Aguilar afcbc8e7ec difftool: move 'git-difftool' out of contrib 
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 <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-04-07 22:19:56 -07:00