merge-recursive: prepare for `merge_submodule()` to report errors

Johannes Schindelin committed over 2 years ago

The fifth batch

Junio C Hamano committed over 2 years ago

Merge branch 'ps/remote-helper-repo-initialization-fix'

Junio C Hamano committed over 2 years ago

Merge branch 'jk/upload-pack-v2-capability-cleanup'

Junio C Hamano committed over 2 years ago

Merge branch 'jk/upload-pack-bounded-resources'

Junio C Hamano committed over 2 years ago

Merge branch 'ps/reftable-repo-init-fix'

Junio C Hamano committed over 2 years ago

Merge branch 'ml/log-merge-with-cherry-pick-and-other-pseudo-heads'

Junio C Hamano committed over 2 years ago

Merge branch 'eg/add-uflags'

Junio C Hamano committed over 2 years ago

Merge branch 'jt/commit-redundant-scissors-fix'

Junio C Hamano committed over 2 years ago

Merge branch 'js/merge-tree-3-trees'

Junio C Hamano committed over 2 years ago

Merge branch 'cc/rev-list-allow-missing-tips'

Junio C Hamano committed over 2 years ago

Merge branch 'jc/no-lazy-fetch'

Junio C Hamano committed over 2 years ago

reftable/block: fix binary search over restart counter

Patrick Steinhardt committed over 2 years ago

reftable/record: fix memory leak when decoding object records

Patrick Steinhardt committed over 2 years ago

wt-status: don't find scissors line beyond buf len

Florian Schmidt committed over 2 years ago

reftable/stack: register compacted tables as tempfiles

Patrick Steinhardt committed over 2 years ago

reftable/stack: register lockfiles during compaction

Patrick Steinhardt committed over 2 years ago

reftable/stack: register new tables as tempfiles

Patrick Steinhardt committed over 2 years ago

lockfile: report when rollback fails

Patrick Steinhardt committed over 2 years ago

doc/gitremote-helpers: fix missing single-quote

Jeff King committed over 2 years ago