Show patches with: Series = RFC: In-core git merge-tree ("Server side merges")       |   12 patches
Patch Series A/R/T S/W/F Date Submitter Delegate State
[12/12] git-merge-tree.txt: add a section on potentional usage mistakes RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[11/12] merge-tree: add a --allow-unrelated-histories flag RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[10/12] merge-tree: provide easy access to `ls-files -u` style info RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[09/12] merge-tree: provide a list of which files have conflicts RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[08/12] merge-ort: provide a merge_get_conflicted_files() helper function RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[07/12] merge-tree: support including merge messages in output RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[06/12] merge-ort: allow update messages to be written to different file stream RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[05/12] merge-ort: split out a separate display_update_messages() function RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[04/12] merge-tree: implement real merges RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[03/12] merge-tree: add option parsing and initial shell for real merge function RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[02/12] merge-tree: move logic for existing merge into new function RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[01/12] merge-tree: rename merge_trees() to trivial_merge_trees() RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New