Show patches with: Series = Cleanup merge API       |   19 patches
Patch Series A/R/T S/W/F Date Submitter Delegate State
[19/19] merge-recursive: provide a better label for diff3 common ancestor Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[18/19] merge-recursive: be consistent with assert Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[17/19] merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[16/19] merge-recursive: alphabetize include list Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[15/19] merge-recursive: split internal fields into a separate struct Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[14/19] merge-recursive: comment and reorder the merge_options fields Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[13/19] merge-recursive: consolidate unnecessary fields in merge_options Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[12/19] merge-recursive: move some definitions around to clean up the header Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[11/19] merge-recursive: rename merge_options argument to opt in header Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[10/19] merge-recursive: rename 'mrtree' to 'result_tree', for clarity Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[09/19] merge-recursive: use common name for ancestors/common/base_list Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[08/19] merge-recursive: fix some overly long lines Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[07/19] Move write_tree_from_memory() from merge-recursive to cache-tree Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[06/19] Change call signature of write_tree_from_memory() Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[05/19] merge-recursive: don't force external callers to do our logging Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[04/19] merge-recursive: exit early if index != head Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[03/19] Ensure index matches head before invoking merge machinery, round N Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[02/19] merge-recursive: remove another implicit dependency on the_repository Cleanup merge API - - - --- 2019-07-25 Elijah Newren New
[01/19] merge-recursive: fix minor memory leak in error condition Cleanup merge API - - - --- 2019-07-25 Elijah Newren New