t3430: add conflicting commit

Phillip Wood committed about 8 years ago

Sixth batch for 2.19 cycle

Junio C Hamano committed about 8 years ago

Merge branch 'jt/connectivity-check-after-unshallow'

Junio C Hamano committed about 8 years ago

Merge branch 'sg/travis-retrieve-trash-upon-failure'

Junio C Hamano committed about 8 years ago

Merge branch 'rs/remote-mv-leakfix'

Junio C Hamano committed about 8 years ago

Merge branch 'es/mw-to-git-chain-fix'

Junio C Hamano committed about 8 years ago

Merge branch 'ms/http-proto-doc'

Junio C Hamano committed about 8 years ago

Merge branch 'nd/pack-objects-threading-doc'

Junio C Hamano committed about 8 years ago

Merge branch 'jn/subtree-test-fixes'

Junio C Hamano committed about 8 years ago

Merge branch 'cb/p4-pre-submit-hook'

Junio C Hamano committed about 8 years ago

Merge branch 'js/vscode'

Junio C Hamano committed about 8 years ago

Merge branch 'bb/redecl-enum-fix'

Junio C Hamano committed about 8 years ago

Merge branch 'jk/banned-function'

Junio C Hamano committed about 8 years ago

Merge branch 'en/merge-recursive-skip-fix'

Junio C Hamano committed about 8 years ago

Merge branch 'jt/tag-following-with-proto-v2-fix'

Junio C Hamano committed about 8 years ago

Merge branch 'jk/size-t'

Junio C Hamano committed about 8 years ago

Merge branch 'sg/coccicheck-updates'

Junio C Hamano committed about 8 years ago

Merge branch 'sb/histogram-less-memory'

Junio C Hamano committed about 8 years ago

Merge branch 'jk/core-use-replace-refs'

Junio C Hamano committed about 8 years ago

Merge branch 'nd/i18n'

Junio C Hamano committed about 8 years ago

← Newer Page 1462 of 4099 Older →