Merge branch 'ds/feature-macros'

Junio C Hamano committed almost 7 years ago

Merge branch 'js/azure-ci-osx-fix'

Junio C Hamano committed almost 7 years ago

Merge branch 'bw/format-patch-o-create-leading-dirs'

Junio C Hamano committed almost 7 years ago

Merge branch 'dl/submodule-set-branch'

Junio C Hamano committed almost 7 years ago

fetch: delay fetch_if_missing=0 until after config

Jonathan Tan committed almost 7 years ago

repo-settings: read an int for index.version

Derrick Stolee committed almost 7 years ago

apply: respect merge.conflictStyle in --3way

Denton Liu committed almost 7 years ago

t4108: demonstrate bug in apply

Denton Liu committed almost 7 years ago

t4108: use `test_config` instead of `git config`

Denton Liu committed almost 7 years ago

t4108: remove git command upstream of pipe

Denton Liu committed almost 7 years ago

t4108: replace create_file with test_write_lines

Denton Liu committed almost 7 years ago

ci: fix GCC install in the Travis CI GCC OSX job

SZEDER Gábor committed almost 7 years ago

config: move documentation to config.h

Heba Waly committed almost 7 years ago

Eleventh batch

Junio C Hamano committed almost 7 years ago

Merge branch 'cb/pcre2-chartables-leakfix'

Junio C Hamano committed almost 7 years ago

Merge branch 'bc/smart-http-atomic-push'

Junio C Hamano committed almost 7 years ago

Merge branch 'wb/fsmonitor-bitmap-fix'

Junio C Hamano committed almost 7 years ago

Merge branch 'sb/userdiff-dts'

Junio C Hamano committed almost 7 years ago

Merge branch 'sg/progress-fix'

Junio C Hamano committed almost 7 years ago

Merge branch 'nr/diff-highlight-indent-fix'

Junio C Hamano committed almost 7 years ago