Show patches with: Series = RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index)       |   8 patches
Patch Series A/R/T S/W/F Date Submitter Delegate State
[v2,8/8] merge-tree: provide an easy way to access which files have conflicts RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2022-01-05 Elijah Newren New
[v2,7/8] merge-tree: support saving merge messages to a separate file RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2022-01-05 Elijah Newren New
[v2,6/8] merge-ort: allow update messages to be written to different file stream RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2022-01-05 Elijah Newren New
[v2,5/8] merge-ort: split out a separate display_update_messages() function RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2022-01-05 Elijah Newren New
[v2,4/8] merge-tree: implement real merges RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2022-01-05 Elijah Newren New
[v2,3/8] merge-tree: add option parsing and initial shell for real merge function RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2022-01-05 Elijah Newren New
[v2,2/8] merge-tree: move logic for existing merge into new function RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2022-01-05 Elijah Newren New
[v2,1/8] merge-tree: rename merge_trees() to trivial_merge_trees() RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2022-01-05 Elijah Newren New