Merge branch 'nd/remote-plural-ours-plus-theirs'

Junio C Hamano committed over 10 years ago

Merge branch 'bn/config-doc-tt-varnames'

Junio C Hamano committed over 10 years ago

Merge branch 'va/i18n-misc-updates'

Junio C Hamano committed over 10 years ago

Merge branch 'js/t3404-typofix'

Junio C Hamano committed over 10 years ago

Merge branch 'sb/z-is-gnutar-ism'

Junio C Hamano committed over 10 years ago

Merge branch 'lp/typofixes'

Junio C Hamano committed over 10 years ago

Merge branch 'sb/submodule-deinit-all'

Junio C Hamano committed over 10 years ago

Merge branch 'jc/config-pathname-type'

Junio C Hamano committed over 10 years ago

Merge branch 'bn/http-cookiefile-config'

Junio C Hamano committed over 10 years ago

Merge branch 'ab/hooks'

Junio C Hamano committed over 10 years ago

Merge branch 'sb/submodule-init'

Junio C Hamano committed over 10 years ago

t1500: be considerate to future potential tests

Eric Sunshine committed over 10 years ago

difftool: handle unmerged files in dir-diff mode

David Aguilar committed over 10 years ago

difftool: initialize variables for readability

David Aguilar committed over 10 years ago

always quote shell arguments to test -z/-n

Jeff King committed over 10 years ago

t9103: modernize test style

Jeff King committed over 10 years ago

t9107: switch inverted single/double quotes in test

Jeff King committed over 10 years ago

t9107: use "return 1" instead of "exit 1"

Jeff King committed over 10 years ago

diff: run arguments through precompose_argv

Alexander Rinass committed over 10 years ago

t9100,t3419: enclose all test code in single-quotes

Jeff King committed over 10 years ago