summaryrefslogtreecommitdiff
path: root/t/lib-httpd/apache.conf
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2009-01-16 00:00:02 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-17 21:40:57 -0800
commit5c38ea31f345d08f37685cf4f50c599a7af56bcf (patch)
tree1eefc0e0c9b34a6a594f64c81abe7c76fe203148 /t/lib-httpd/apache.conf
parentbash: refactor 'git log --pretty=<format>' options (diff)
downloadtgif-5c38ea31f345d08f37685cf4f50c599a7af56bcf.tar.xz
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>
Diffstat (limited to 't/lib-httpd/apache.conf')
0 files changed, 0 insertions, 0 deletions