Merge branch 'mh/fast-import-notes-fix-new'

Junio C Hamano committed over 9 years ago

Merge branch 'jc/git-open-cloexec'

Junio C Hamano committed over 9 years ago

Merge branch 'jc/compression-config'

Junio C Hamano committed over 9 years ago

Merge branch 'dt/smart-http-detect-server-going-away'

Junio C Hamano committed over 9 years ago

Merge branch 'mm/gc-safety-doc'

Junio C Hamano committed over 9 years ago

Merge branch 'mm/push-social-engineering-attack-doc'

Junio C Hamano committed over 9 years ago

Merge branch 'jt/fetch-no-redundant-tag-fetch-map'

Junio C Hamano committed over 9 years ago

Merge branch 'jc/latin-1'

Junio C Hamano committed over 9 years ago

mergetool: fix running in subdir when rerere enabled

Richard Hansen committed over 9 years ago

mergetool: take the "-O" out of $orderfile

Richard Hansen committed over 9 years ago

t7610: add test case for rerere+mergetool+subdir bug

Richard Hansen committed over 9 years ago

t7610: spell 'git reset --hard' consistently

Richard Hansen committed over 9 years ago

t7610: don't assume the checked-out commit

Richard Hansen committed over 9 years ago

t7610: always work on a test-specific branch

Richard Hansen committed over 9 years ago

t7610: delete some now-unnecessary 'git reset --hard' lines

Richard Hansen committed over 9 years ago

t7610: run 'git reset --hard' after each test to clean up

Richard Hansen committed over 9 years ago

t7610: don't rely on state from previous test

Richard Hansen committed over 9 years ago

t7610: use test_when_finished for cleanup tasks

Richard Hansen committed over 9 years ago

t7610: move setup code to the 'setup' test case

Richard Hansen committed over 9 years ago

t7610: update branch names to match test number

Richard Hansen committed over 9 years ago