Merge branch 'en/ort-perf-batch-9'

Junio C Hamano committed over 5 years ago

Merge branch 'en/sequencer-edit-upon-conflict-fix'

Junio C Hamano committed over 5 years ago

Merge branch 'tb/reverse-midx'

Junio C Hamano committed over 5 years ago

Merge branch 'll/clone-reject-shallow'

Junio C Hamano committed over 5 years ago

blame tests: simplify userdiff driver test

Ævar Arnfjörð Bjarmason committed over 5 years ago

blame tests: don't rely on t/t4018/ directory

Ævar Arnfjörð Bjarmason committed over 5 years ago

userdiff: remove support for "broken" tests

Ævar Arnfjörð Bjarmason committed over 5 years ago

userdiff tests: list builtin drivers via test-tool

Ævar Arnfjörð Bjarmason committed over 5 years ago

userdiff tests: explicitly test "default" pattern

Ævar Arnfjörð Bjarmason committed over 5 years ago

userdiff: add and use for_each_userdiff_driver()

Ævar Arnfjörð Bjarmason committed over 5 years ago

userdiff style: normalize pascal regex declaration

Ævar Arnfjörð Bjarmason committed over 5 years ago

userdiff style: declare patterns with consistent style

Ævar Arnfjörð Bjarmason committed over 5 years ago

userdiff style: re-order drivers in alphabetical order

Ævar Arnfjörð Bjarmason committed over 5 years ago

config.c: remove last remnant of GIT_TEST_GETTEXT_POISON

Ævar Arnfjörð Bjarmason committed over 5 years ago

completion: audit and guard $GIT_* against unset use

Ville Skyttä committed over 5 years ago

git-apply: allow simultaneous --cached and --3way options

Jerry Zhang committed over 5 years ago

The seventh batch

Junio C Hamano committed over 5 years ago

Merge branch 'ab/fsck-api-cleanup'

Junio C Hamano committed over 5 years ago

Merge branch 'cc/downcase-opt-help'

Junio C Hamano committed over 5 years ago

Merge branch 'js/security-md'

Junio C Hamano committed over 5 years ago