t7800-difftool.sh: Test mergetool.prompt fallback

David Aguilar committed almost 17 years ago

Update draft release notes to 1.7.0

Junio C Hamano committed almost 17 years ago

msvc: Fix an "unrecognized option" linker warning

Ramsay Jones committed almost 17 years ago

Merge branch 'maint'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/branch-d'

Junio C Hamano committed almost 17 years ago

Merge branch 'il/rev-glob'

Junio C Hamano committed almost 17 years ago

Merge branch 'js/refer-upstream'

Junio C Hamano committed almost 17 years ago

Merge branch 'jl/submodule-diff'

Junio C Hamano committed almost 17 years ago

Merge branch 'il/remote-updates'

Junio C Hamano committed almost 17 years ago

Merge branch 'il/branch-set-upstream'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/maint-limit-note-output'

Junio C Hamano committed almost 17 years ago

Merge branch 'nd/ls-files-sparse-fix'

Junio C Hamano committed almost 17 years ago

Make difftool.prompt fall back to mergetool.prompt

Sebastian Schuberth committed almost 17 years ago

ignore duplicated slashes in make_relative_path()

Junio C Hamano committed almost 17 years ago

rebase -i: Enclose sed command substitution in quotes

Michael Haggerty committed almost 17 years ago

← Newer Page 3046 of 4099 Older →