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

rev-list: add "int bisect_show_flags" in "struct rev_list_info"

Christian Couder committed over 17 years ago

rev-list: remove last static vars used in "show_commit"

Christian Couder committed over 17 years ago

list-objects: add "void *data" parameter to show functions

Christian Couder committed over 17 years ago

git-rev-list.txt: make ascii markup uniform with other pages.

Matthieu Moy committed over 17 years ago

git-send-email.txt: clarify which options take an argument.

Matthieu Moy committed over 17 years ago