delta/git.git - github.com: git/git.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Explain seemingly pointless use of system in difftool	Alex Riesen	2009-04-24	1	-0/+6
\| \| \| \| \| \| \|	Portability reasons. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Wait for git diff to finish in git difftool	Alex Riesen	2009-04-22	1	-1/+2
\| \| \| \| \| \| \| \| \| \|	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>
*	difftool: add support for a difftool.prompt config variable	David Aguilar	2009-04-07	1	-3/+12
\| \| \| \| \| \| \| \| \|	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>
*	difftool: move 'git-difftool' out of contrib	David Aguilar	2009-04-07	1	-0/+76
	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>