Show patches with: Submitter = Elijah Newren       |   2068 patches
« 1 2 ... 6 7 820 21 »
Patch Series A/R/T S/W/F Date Submitter Delegate State
[v4,07/12] merge-ort: provide a merge_get_conflicted_files() helper function In-core git merge-tree ("Server side merges") - - - --- 2022-02-12 Elijah Newren Superseded
[v4,06/12] merge-tree: support including merge messages in output In-core git merge-tree ("Server side merges") - - - --- 2022-02-12 Elijah Newren Superseded
[v4,05/12] merge-ort: split out a separate display_update_messages() function In-core git merge-tree ("Server side merges") - - - --- 2022-02-12 Elijah Newren Superseded
[v4,04/12] merge-tree: implement real merges In-core git merge-tree ("Server side merges") - - - --- 2022-02-12 Elijah Newren Superseded
[v4,03/12] merge-tree: add option parsing and initial shell for real merge function In-core git merge-tree ("Server side merges") - - - --- 2022-02-12 Elijah Newren Superseded
[v4,02/12] merge-tree: move logic for existing merge into new function In-core git merge-tree ("Server side merges") - - - --- 2022-02-12 Elijah Newren Superseded
[v4,01/12] merge-tree: rename merge_trees() to trivial_merge_trees() In-core git merge-tree ("Server side merges") - - - --- 2022-02-12 Elijah Newren Superseded
[v3,15/15] git-merge-tree.txt: add a section on potentional usage mistakes In-core git merge-tree ("Server side merges") - - - --- 2022-02-02 Elijah Newren New
[v3,14/15] merge-tree: add a --allow-unrelated-histories flag In-core git merge-tree ("Server side merges") - - - --- 2022-02-02 Elijah Newren New
[v3,13/15] merge-tree: allow `ls-files -u` style info to be NUL terminated In-core git merge-tree ("Server side merges") - - - --- 2022-02-02 Elijah Newren New
[v3,12/15] merge-tree: provide easy access to `ls-files -u` style info In-core git merge-tree ("Server side merges") - - - --- 2022-02-02 Elijah Newren New
[v3,11/15] merge-tree: provide a list of which files have conflicts In-core git merge-tree ("Server side merges") - - - --- 2022-02-02 Elijah Newren New
[v3,10/15] merge-ort: provide a merge_get_conflicted_files() helper function In-core git merge-tree ("Server side merges") - - - --- 2022-02-02 Elijah Newren New
[v3,09/15] merge-tree: support including merge messages in output In-core git merge-tree ("Server side merges") - - - --- 2022-02-02 Elijah Newren New
[v3,08/15] merge-ort: allow update messages to be written to different file stream In-core git merge-tree ("Server side merges") - - - --- 2022-02-02 Elijah Newren New
[v3,07/15] merge-ort: split out a separate display_update_messages() function In-core git merge-tree ("Server side merges") - - - --- 2022-02-02 Elijah Newren New
[v3,04/15] merge-tree: implement real merges In-core git merge-tree ("Server side merges") - - - --- 2022-02-02 Elijah Newren New
[v3,03/15] merge-tree: add option parsing and initial shell for real merge function In-core git merge-tree ("Server side merges") - - - --- 2022-02-02 Elijah Newren New
[v3,02/15] merge-tree: move logic for existing merge into new function In-core git merge-tree ("Server side merges") - - - --- 2022-02-02 Elijah Newren New
[v3,01/15] merge-tree: rename merge_trees() to trivial_merge_trees() In-core git merge-tree ("Server side merges") - - - --- 2022-02-02 Elijah Newren New
[v4,3/3] repo-settings: rename the traditional default fetch.negotiationAlgorithm repo-settings: fix checking for fetch.negotiationAlgorithm=default - - - --- 2022-02-02 Elijah Newren Accepted
[v4,2/3] repo-settings: fix error handling for unknown values repo-settings: fix checking for fetch.negotiationAlgorithm=default - - - --- 2022-02-02 Elijah Newren Accepted
[v4,1/3] repo-settings: fix checking for fetch.negotiationAlgorithm=default repo-settings: fix checking for fetch.negotiationAlgorithm=default - - - --- 2022-02-02 Elijah Newren Accepted
[v5,10/10] diff-merges: avoid history simplifications when diffing merges Add a new --remerge-diff capability to show & log - - - --- 2022-02-02 Elijah Newren Accepted
[v5,09/10] merge-ort: mark conflict/warning messages from inner merges as omittable Add a new --remerge-diff capability to show & log - - - --- 2022-02-02 Elijah Newren Accepted
[v5,08/10] show, log: include conflict/warning messages in --remerge-diff headers Add a new --remerge-diff capability to show & log - - - --- 2022-02-02 Elijah Newren Accepted
[v5,07/10] diff: add ability to insert additional headers for paths Add a new --remerge-diff capability to show & log - - - --- 2022-02-02 Elijah Newren Accepted
[v5,06/10] merge-ort: format messages slightly different for use in headers Add a new --remerge-diff capability to show & log - - - --- 2022-02-02 Elijah Newren Accepted
[v5,05/10] merge-ort: mark a few more conflict messages as omittable Add a new --remerge-diff capability to show & log - - - --- 2022-02-02 Elijah Newren Accepted
[v5,04/10] merge-ort: capture and print ll-merge warnings in our preferred fashion Add a new --remerge-diff capability to show & log - - - --- 2022-02-02 Elijah Newren Accepted
[v5,03/10] ll-merge: make callers responsible for showing warnings Add a new --remerge-diff capability to show & log - - - --- 2022-02-02 Elijah Newren Accepted
[v5,02/10] log: clean unneeded objects during `log --remerge-diff` Add a new --remerge-diff capability to show & log - - - --- 2022-02-02 Elijah Newren Accepted
[v5,01/10] show, log: provide a --remerge-diff capability Add a new --remerge-diff capability to show & log - - - --- 2022-02-02 Elijah Newren Accepted
[v3,3/3] repo-settings: name the default fetch.negotiationAlgorithm 'consecutive' repo-settings: fix checking for fetch.negotiationAlgorithm=default - - - --- 2022-02-01 Elijah Newren Superseded
[v3,2/3] repo-settings: fix error handling for unknown values repo-settings: fix checking for fetch.negotiationAlgorithm=default - - - --- 2022-02-01 Elijah Newren Superseded
[v3,1/3] repo-settings: fix checking for fetch.negotiationAlgorithm=default repo-settings: fix checking for fetch.negotiationAlgorithm=default - - - --- 2022-02-01 Elijah Newren Superseded
[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,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
[v2] repo-settings: fix checking for fetch.negotiationAlgorithm=default [v2] repo-settings: fix checking for fetch.negotiationAlgorithm=default - - - --- 2022-01-29 Elijah Newren New
2.35.1.txt: clarify the rebase/stash regression 2.35.1.txt: clarify the rebase/stash regression - - - --- 2022-01-29 Elijah Newren New
sparse-checkout: fix a couple minor memory leaks sparse-checkout: fix a couple minor memory leaks - - - --- 2022-01-28 Elijah Newren Accepted
repo-settings: fix checking for fetch.negotiationAlgorithm=default repo-settings: fix checking for fetch.negotiationAlgorithm=default - - - --- 2022-01-28 Elijah Newren Superseded
sequencer, stash: fix running from worktree subdir sequencer, stash: fix running from worktree subdir - 1 - --- 2022-01-26 Elijah Newren Accepted
[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
[v4,10/10] diff-merges: avoid history simplifications when diffing merges Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren Superseded
[v4,09/10] merge-ort: mark conflict/warning messages from inner merges as omittable Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren Superseded
[v4,08/10] show, log: include conflict/warning messages in --remerge-diff headers Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren Superseded
[v4,07/10] diff: add ability to insert additional headers for paths Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren Superseded
[v4,06/10] merge-ort: format messages slightly different for use in headers Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren Superseded
[v4,05/10] merge-ort: mark a few more conflict messages as omittable Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren Superseded
[v4,04/10] merge-ort: capture and print ll-merge warnings in our preferred fashion Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren Superseded
[v4,03/10] ll-merge: make callers responsible for showing warnings Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren Superseded
[v4,02/10] log: clean unneeded objects during `log --remerge-diff` Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren Superseded
[v4,01/10] show, log: provide a --remerge-diff capability Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren Superseded
[2/2] merge: fix memory leaks in cmd_merge() Fix some old memory leaks in merge-ort and builtin/merge - - - --- 2022-01-20 Elijah Newren Accepted
[1/2] merge-ort: fix memory leak in merge_ort_internal() Fix some old memory leaks in merge-ort and builtin/merge - - - --- 2022-01-20 Elijah Newren Accepted
[v2] merge-ort: avoid assuming all renames detected [v2] merge-ort: avoid assuming all renames detected - - - --- 2022-01-17 Elijah Newren Accepted
merge-ort: avoid assuming all renames detected merge-ort: avoid assuming all renames detected - - - --- 2022-01-15 Elijah Newren Superseded
leak tests: ignore some new leaks in a few tests leak tests: ignore some new leaks in a few tests - - - --- 2022-01-14 Elijah Newren New
[v2,5/5] Accelerate clear_skip_worktree_from_present_files() by caching Remove the present-despite-SKIP_WORKTREE class of bugs (for sparse-checkouts) - - - --- 2022-01-14 Elijah Newren Accepted
[v2,4/5] Update documentation related to sparsity and the skip-worktree bit Remove the present-despite-SKIP_WORKTREE class of bugs (for sparse-checkouts) - - - --- 2022-01-14 Elijah Newren Accepted
[v2,3/5] repo_read_index: clear SKIP_WORKTREE bit from files present in worktree Remove the present-despite-SKIP_WORKTREE class of bugs (for sparse-checkouts) - - - --- 2022-01-14 Elijah Newren Accepted
[v2,2/5] unpack-trees: fix accidental loss of user changes Remove the present-despite-SKIP_WORKTREE class of bugs (for sparse-checkouts) - - - --- 2022-01-14 Elijah Newren Accepted
[v2,1/5] t1011: add testcase demonstrating accidental loss of user modifications Remove the present-despite-SKIP_WORKTREE class of bugs (for sparse-checkouts) - - - --- 2022-01-14 Elijah Newren Accepted
[5/5] Accelerate clear_skip_worktree_from_present_files() by caching Remove the present-despite-SKIP_WORKTREE class of bugs (for sparse-checkouts) - - - --- 2022-01-13 Elijah Newren Superseded
[4/5] Update documentation related to sparsity and the skip-worktree bit Remove the present-despite-SKIP_WORKTREE class of bugs (for sparse-checkouts) - - - --- 2022-01-13 Elijah Newren Superseded
[3/5] repo_read_index: clear SKIP_WORKTREE bit from files present in worktree Remove the present-despite-SKIP_WORKTREE class of bugs (for sparse-checkouts) - - - --- 2022-01-13 Elijah Newren Superseded
[2/5] unpack-trees: fix accidental loss of user changes Remove the present-despite-SKIP_WORKTREE class of bugs (for sparse-checkouts) - - - --- 2022-01-13 Elijah Newren Superseded
[1/5] t1011: add testcase demonstrating accidental loss of user modifications Remove the present-despite-SKIP_WORKTREE class of bugs (for sparse-checkouts) - - - --- 2022-01-13 Elijah Newren Superseded
[RFC,5/5] Accelerate ensure_skip_worktree_means_skip_worktree by caching Remove the present-despite-SKIP_WORKTREE class of bugs - - - --- 2022-01-09 Elijah Newren New
[RFC,4/5] Update documentation related to sparsity and the skip-worktree bit Remove the present-despite-SKIP_WORKTREE class of bugs - - - --- 2022-01-09 Elijah Newren New
[RFC,3/5] repo_read_index: ensure SKIP_WORKTREE means skip worktree Remove the present-despite-SKIP_WORKTREE class of bugs - - - --- 2022-01-09 Elijah Newren New
[RFC,2/5] unpack-trees: fix accidental loss of user changes Remove the present-despite-SKIP_WORKTREE class of bugs - - - --- 2022-01-09 Elijah Newren Accepted
[RFC,1/5] t1011: add testcase demonstrating accidental loss of user modifications Remove the present-despite-SKIP_WORKTREE class of bugs - - - --- 2022-01-09 Elijah Newren Accepted
[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
« 1 2 ... 6 7 820 21 »