Merge branch 'maint-1.6.0' into maint-1.6.1

Junio C Hamano committed over 17 years ago

Merge branch 'lt/reflog-expire'

Junio C Hamano committed over 17 years ago

Merge branch 'bs/maint-1.6.0-tree-walk-prefix'

Junio C Hamano committed over 17 years ago

Merge branch 'ms/http-auth'

Junio C Hamano committed over 17 years ago

Merge branch 'js/maint-submodule-checkout'

Junio C Hamano committed over 17 years ago

Merge branch 'cb/maint-merge-recursive-submodule-fix'

Junio C Hamano committed over 17 years ago

Merge branch 'mh/html-path'

Junio C Hamano committed over 17 years ago

mergetool: use $( ... ) instead of `backticks`

David Aguilar committed over 17 years ago

bash completion: add git-difftool

David Aguilar committed over 17 years ago

difftool: add support for a difftool.prompt config variable

David Aguilar committed over 17 years ago

difftool: add various git-difftool tests

David Aguilar committed over 17 years ago

difftool: move 'git-difftool' out of contrib

David Aguilar committed over 17 years ago

difftool/mergetool: add diffuse as merge and diff tool

Sebastian Pipping committed over 17 years ago

difftool: add a -y shortcut for --no-prompt

David Aguilar committed over 17 years ago

difftool: use perl built-ins when testing for msys

David Aguilar committed over 17 years ago

difftool: remove the backup file feature

David Aguilar committed over 17 years ago

difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff

David Aguilar committed over 17 years ago

git-mergetool: add new merge tool TortoiseMerge

Markus Heidelberg committed over 17 years ago

git-mergetool/difftool: make (g)vimdiff workable under Windows

Markus Heidelberg committed over 17 years ago

doc/merge-config: list ecmerge as a built-in merge tool

Markus Heidelberg committed over 17 years ago