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
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
Merge branch 'jt/clone-unborn-head'
Junio C Hamano committed over 5 years ago
Merge branch 'js/fsmonitor-unpack-fix'
Junio C Hamano committed over 5 years ago
Merge branch 'jk/bisect-peel-tag-fix'
Junio C Hamano committed over 5 years ago
Merge branch 'jh/fsmonitor-prework'
Junio C Hamano committed over 5 years ago
Junio C Hamano committed over 5 years ago
builtin/pack-objects.c: ignore missing links with --stdin-packs
Taylor Blau committed over 5 years ago