Merge branch 'sg/t7800-difftool-robustify'

Junio C Hamano committed over 5 years ago

Merge branch 'ab/lose-grep-debug'

Junio C Hamano committed over 5 years ago

Merge branch 'jk/use-oid-pos'

Junio C Hamano committed over 5 years ago

t1500: ensure current --since= behavior remains

Eric Wong committed over 5 years ago

doc/rebase -i: fix typo in the documentation of 'fixup' command

Charvi Mendiratta committed over 5 years ago

t/t3437: fixup the test 'multiple fixup -c opens editor once'

Charvi Mendiratta committed over 5 years ago

t/t3437: use named commits in the tests

Charvi Mendiratta committed over 5 years ago

t/t3437: simplify and document the test helpers

Charvi Mendiratta committed over 5 years ago

t/t3437: check the author date of fixed up commit

Charvi Mendiratta committed over 5 years ago

t/t3437: remove the dependency of 'expected-message' file from tests

Charvi Mendiratta committed over 5 years ago

t/t3437: fixup here-docs in the 'setup' test

Charvi Mendiratta committed over 5 years ago

t/lib-rebase: update the documentation of FAKE_LINES

Charvi Mendiratta committed over 5 years ago

rebase -i: clarify and fix 'fixup -c' rebase-todo help

Charvi Mendiratta committed over 5 years ago

t/.gitattributes: sort lines

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

test-lib-functions: move function to lib-bitmap.sh

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

test libs: rename gitweb-lib.sh to lib-gitweb.sh

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

test libs: rename bundle helper to "lib-bundle.sh"

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

test-lib-functions: remove generate_zero_bytes() wrapper

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

test-lib-functions: move test_set_index_version() to its user

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

test lib: change "error" to "BUG" as appropriate

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