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