Show patches with: Series = Clean up merge API       |    State = Action Required       |    Archived = No       |   24 patches
Patch Series A/R/T S/W/F Date Submitter Delegate State
[v4,24/24] merge-recursive: alphabetize include list Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,23/24] merge-recursive: add sanity checks for relevant merge_options Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,22/24] merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,21/24] merge-recursive: split internal fields into a separate struct Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,20/24] merge-recursive: avoid losing output and leaking memory holding that output Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,19/24] merge-recursive: comment and reorder the merge_options fields Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,18/24] merge-recursive: consolidate unnecessary fields in merge_options Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,17/24] merge-recursive: move some definitions around to clean up the header Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,16/24] merge-recursive: rename merge_options argument to opt in header Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,15/24] merge-recursive: rename 'mrtree' to 'result_tree', for clarity Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,14/24] merge-recursive: use common name for ancestors/common/base_list Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,13/24] merge-recursive: fix some overly long lines Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,12/24] cache-tree: share code between functions writing an index as a tree Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,11/24] merge-recursive: don't force external callers to do our logging Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,10/24] merge-recursive: remove useless parameter in merge_trees() Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,09/24] merge-recursive: exit early if index != head Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,08/24] Ensure index matches head before invoking merge machinery, round N Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,07/24] merge-recursive: remove another implicit dependency on the_repository Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,06/24] merge-recursive: future-proof update_file_flags() against memory leaks Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,05/24] merge-recursive: introduce an enum for detect_directory_renames values Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,04/24] merge-recursive: provide a better label for diff3 common ancestor Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,03/24] merge-recursive: enforce opt->ancestor != NULL when calling merge_trees() Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,02/24] checkout: provide better conflict hunk description with detached HEAD Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New
[v4,01/24] merge-recursive: be consistent with assert Clean up merge API - - - 0 0 0 2019-08-17 Elijah Newren New