Merge branch 'en/rebase-merge-on-sequencer'

Junio C Hamano committed over 7 years ago

git-rebase.txt: update to reflect merge now implemented on sequencer

Elijah Newren committed over 7 years ago

t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache

Todd Zullinger committed over 7 years ago

remote-curl: reduce scope of rpc_state.result

Jonathan Tan committed over 7 years ago

remote-curl: reduce scope of rpc_state.stdin_preamble

Jonathan Tan committed over 7 years ago

remote-curl: reduce scope of rpc_state.argv

Jonathan Tan committed over 7 years ago

t1404: do not rely on the exact phrasing of strerror()

Junio C Hamano committed over 7 years ago

docs/git-rebase: remove redundant entry in incompatible options list

Emilio Cobos Álvarez committed over 7 years ago

Git 2.21-rc1

Junio C Hamano committed over 7 years ago

Merge branch 'ab/rebase-test-fix'

Junio C Hamano committed over 7 years ago

Merge branch 'rb/no-dev-zero-in-test'

Junio C Hamano committed over 7 years ago

Merge branch 'rs/bash-is-in-coreutils-on-nonstop'

Junio C Hamano committed over 7 years ago

Merge branch 'js/mingw-host-cpu'

Junio C Hamano committed over 7 years ago

Merge branch 'sg/stress-test'

Junio C Hamano committed over 7 years ago

Merge branch 'kd/t0028-octal-del-is-377-not-777'

Junio C Hamano committed over 7 years ago

Merge branch 'bc/utf16-portability-fix'

Junio C Hamano committed over 7 years ago

Merge branch 'nd/fileno-may-be-macro'

Junio C Hamano committed over 7 years ago

Merge branch 'nd/get-oid-with-context-returns-an-enum'

Junio C Hamano committed over 7 years ago

Merge branch 'rj/sequencer-sign-off-header-static'

Junio C Hamano committed over 7 years ago

rebase: fix regression in rebase.useBuiltin=false test mode

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