| commit | 5c38ea31f345d08f37685cf4f50c599a7af56bcf | |
| author | David Aguilar <davvid@gmail.com> | |
| Fri, 16 Jan 2009 08:00:02 +0000 (16 00:00 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 18 Jan 2009 05:40:57 +0000 (17 21:40 -0800) | ||
| tree | 1eefc0e0c9b34a6a594f64c81abe7c76fe203148 | treesnapshot (tar.gz zip) |
| parent | 3d279863dedf6c07eefe307b27fb3a08e519140f | commitdiff |
contrib: add 'git difftool' for launching common merge tools
'git difftool' is a git command that allows you to compare and edit files
between revisions using common merge tools. 'git difftool' does what
'git mergetool' does but its use is for non-merge situations such as
when preparing commits or comparing changes against the index.
It uses the same configuration variables as 'git mergetool' and
provides the same command-line interface as 'git diff'.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
'git difftool' is a git command that allows you to compare and edit files
between revisions using common merge tools. 'git difftool' does what
'git mergetool' does but its use is for non-merge situations such as
when preparing commits or comparing changes against the index.
It uses the same configuration variables as 'git mergetool' and
provides the same command-line interface as 'git diff'.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/difftool/git-difftool | [new file with mode: 0755] | blob |
| contrib/difftool/git-difftool-helper | [new file with mode: 0755] | blob |
| contrib/difftool/git-difftool.txt | [new file with mode: 0644] | blob |