git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-01 04:06:54 -06:00
Code Issues Packages Projects Releases 335 Wiki Activity
18,394 Commits 19 Branches 1,101 Tags
Commit Graph

2 Commits

Author SHA1 Message Date
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