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