Show patches with: Series = In-core git merge-tree ("Server side merges")       |    Archived = No       |   17 patches
Patch Series A/R/T S/W/F Date Submitter Delegate State
[v7,17/17] git-merge-tree.txt: add a section on potentional usage mistakes In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Elijah Newren Accepted
[v7,16/17] merge-tree: add a --allow-unrelated-histories flag In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Elijah Newren Accepted
[v7,15/17] merge-tree: allow `ls-files -u` style info to be NUL terminated In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Elijah Newren Accepted
[v7,14/17] merge-ort: optionally produce machine-readable output In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Elijah Newren Accepted
[v7,13/17] merge-ort: store more specific conflict information In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Elijah Newren Accepted
[v7,12/17] merge-ort: make `path_messages` a strmap to a string_list In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Johannes Schindelin Accepted
[v7,11/17] merge-ort: store messages in a list, not in a single strbuf In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Johannes Schindelin Accepted
[v7,10/17] merge-tree: provide easy access to `ls-files -u` style info In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Elijah Newren Accepted
[v7,09/17] merge-tree: provide a list of which files have conflicts In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Elijah Newren Accepted
[v7,08/17] merge-ort: remove command-line-centric submodule message from merge-ort In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Elijah Newren Accepted
[v7,07/17] merge-ort: provide a merge_get_conflicted_files() helper function In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Elijah Newren Accepted
[v7,06/17] merge-tree: support including merge messages in output In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Elijah Newren Accepted
[v7,05/17] merge-ort: split out a separate display_update_messages() function In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Elijah Newren Accepted
[v7,04/17] merge-tree: implement real merges In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Elijah Newren Accepted
[v7,03/17] merge-tree: add option parsing and initial shell for real merge function In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Elijah Newren Accepted
[v7,02/17] merge-tree: move logic for existing merge into new function In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Elijah Newren Accepted
[v7,01/17] merge-tree: rename merge_trees() to trivial_merge_trees() In-core git merge-tree ("Server side merges") - - - --- 2022-06-18 Elijah Newren Accepted