t6416: correct expectation for rename/rename(1to2) + directory/file

Elijah Newren committed almost 6 years ago

merge tests: expect improved directory/file conflict handling in ort

Elijah Newren committed almost 6 years ago

t/: new helper for tests that pass with ort but fail with recursive

Elijah Newren committed almost 6 years ago

am, sequencer: stop parsing our own committer ident

Jeff King committed almost 6 years ago

t1400: prepare for `main` being default branch name

Johannes Schindelin committed almost 6 years ago

tests: prepare aligned mentions of the default branch name

Johannes Schindelin committed almost 6 years ago

t9902: prepare a test for the upcoming default branch name

Johannes Schindelin committed almost 6 years ago

t3200: prepare for `main` being shorter than `master`

Johannes Schindelin committed almost 6 years ago

t5703: adjust a test case for the upcoming default branch name

Johannes Schindelin committed almost 6 years ago

t6200: adjust suppression pattern to also match "main"

Johannes Schindelin committed almost 6 years ago

tests: start moving to a different default main branch name

Johannes Schindelin committed almost 6 years ago

t9801: use `--` in preparation for default branch rename

Johannes Schindelin committed almost 6 years ago

fmt-merge-msg: also suppress "into main" by default

Johannes Schindelin committed almost 6 years ago

rebase: fix broken email with --committer-date-is-author-date

Jeff King committed almost 6 years ago

am: fix broken email with --committer-date-is-author-date

Jeff King committed almost 6 years ago

t3436: check --committer-date-is-author-date result more carefully

Jeff King committed almost 6 years ago

Sync with Git 2.29.1

Junio C Hamano committed almost 6 years ago

Git 2.29.1

Junio C Hamano committed almost 6 years ago

Merge branch 'js/no-builtins-on-disk-option' into maint

Junio C Hamano committed almost 6 years ago

t7102: prepare expected output inside test_expect_* block

Junio C Hamano committed almost 6 years ago