t6423: mark remaining expected failure under merge-ort as such

Elijah Newren committed over 5 years ago

Revert "merge-ort: ignore the directory rename split conflict for now"

Elijah Newren committed over 5 years ago

merge-recursive: add a bunch of FIXME comments documenting known bugs

Elijah Newren committed over 5 years ago

merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict

Elijah Newren committed over 5 years ago

t: mark several submodule merging tests as fixed under merge-ort

Elijah Newren committed over 5 years ago

merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries

Elijah Newren committed over 5 years ago

t6428: new test for SKIP_WORKTREE handling and conflicts

Elijah Newren committed over 5 years ago

merge-ort: support subtree shifting

Elijah Newren committed over 5 years ago

merge-ort: let renormalization change modify/delete into clean delete

Elijah Newren committed over 5 years ago

merge-ort: have ll_merge() use a special attr_index for renormalization

Elijah Newren committed over 5 years ago

merge-ort: add a special minimal index just for renormalization

Elijah Newren committed over 5 years ago

merge-ort: use STABLE_QSORT instead of QSORT where required

Elijah Newren committed over 5 years ago

Merge branch 'tb/git-mv-icase-fix'

Junio C Hamano committed over 5 years ago

The first batch in 2.32 cycle

Junio C Hamano committed over 5 years ago

Merge branch 'rs/xcalloc-takes-nelem-first'

Junio C Hamano committed over 5 years ago

Merge branch 'ah/make-fuzz-all-doc-update'

Junio C Hamano committed over 5 years ago

Merge branch 'jk/slimmed-down'

Junio C Hamano committed over 5 years ago

Merge branch 'rs/calloc-array'

Junio C Hamano committed over 5 years ago

Merge branch 'rs/avoid-null-statement-after-macro-call'

Junio C Hamano committed over 5 years ago

Merge branch 'km/config-doc-typofix'

Junio C Hamano committed over 5 years ago