Show patches with: Submitter = Elijah Newren       |    Archived = No       |   1285 patches
« 1 2 ... 4 5 6 … 12 13 »
Patch Series A/R/T S/W/F Date Submitter Delegate State
[1/2] merge: only apply autostash when appropriate Miscellaneous merge fixes - - - --- 2022-08-21 Elijah Newren Superseded
t64??: convert 'test_create_repo' to 'git init' t64??: convert 'test_create_repo' to 'git init' - 1 - --- 2022-08-20 Elijah Newren Accepted
merge-ort: remove code obsoleted by other changes merge-ort: remove code obsoleted by other changes - - - --- 2022-08-19 Elijah Newren Accepted
[v3,3/3] revision: allow --ancestry-path to take an argument Allow --ancestry-path to take an argument - - - --- 2022-08-19 Elijah Newren Accepted
[v3,1/3] rev-list-options.txt: fix simple typo Allow --ancestry-path to take an argument - - - --- 2022-08-19 Elijah Newren Accepted
[v3,3/3] merge-ort: provide helpful submodule update message when possible Fixups for cw/submodule-merge-messages - - - --- 2022-08-18 Elijah Newren Accepted
[v3,2/3] merge-ort: avoid surprise with new sub_flag variable Fixups for cw/submodule-merge-messages - - - --- 2022-08-18 Elijah Newren Accepted
[v3,1/3] merge-ort: remove translator lego in new "submodule conflict suggestion" Fixups for cw/submodule-merge-messages - - - --- 2022-08-18 Elijah Newren Accepted
[v2,2/2] revision: allow --ancestry-path to take an argument Allow --ancestry-path to take an argument - - - --- 2022-08-18 Elijah Newren Superseded
[v2,1/2] rev-list-options.txt: fix simple typo Allow --ancestry-path to take an argument - - - --- 2022-08-18 Elijah Newren Superseded
[v2,3/3] merge-ort: provide helpful submodule update message when possible Fixups for cw/submodule-merge-messages - - - --- 2022-08-17 Elijah Newren Superseded
[v2,2/3] merge-ort: add comment to avoid surprise with new sub_flag variable Fixups for cw/submodule-merge-messages - - - --- 2022-08-17 Elijah Newren Superseded
[v2,1/3] merge-ort: remove translator lego in new "submodule conflict suggestion" Fixups for cw/submodule-merge-messages - - - --- 2022-08-17 Elijah Newren Superseded
[1/2] rev-list-options.txt: fix simple typo Allow --ancestry-path to take an argument - - - --- 2022-08-17 Elijah Newren Accepted
[3/3] merge-ort: provide helpful submodule update message when possible Fixups for cw/submodule-merge-messages - - - --- 2022-08-17 Elijah Newren Superseded
[2/3] merge-ort: add comment to avoid surprise with new sub_flag variable Fixups for cw/submodule-merge-messages - - - --- 2022-08-17 Elijah Newren Superseded
[1/3] merge-ort: remove translator lego in new "submodule conflict suggestion" Fixups for cw/submodule-merge-messages - - - --- 2022-08-17 Elijah Newren Superseded
[v5,8/8] merge: do not exit restore_state() prematurely Fix merge restore state - - - --- 2022-07-23 Elijah Newren Accepted
[v5,7/8] merge: ensure we can actually restore pre-merge state Fix merge restore state - - - --- 2022-07-23 Elijah Newren Accepted
[v5,6/8] merge: make restore_state() restore staged state too Fix merge restore state - - - --- 2022-07-23 Elijah Newren Accepted
[v5,5/8] merge: fix save_state() to work when there are stat-dirty files Fix merge restore state - - - --- 2022-07-23 Elijah Newren Accepted
[v5,4/8] merge: do not abort early if one strategy fails to handle the merge Fix merge restore state - - - --- 2022-07-23 Elijah Newren Accepted
[v5,3/8] merge: abort if index does not match HEAD for trivial merges Fix merge restore state - - - --- 2022-07-23 Elijah Newren Accepted
[v5,2/8] merge-resolve: abort if index does not match HEAD Fix merge restore state - - - --- 2022-07-23 Elijah Newren Accepted
[v5,1/8] merge-ort-wrappers: make printed message match the one from recursive Fix merge restore state - - - --- 2022-07-23 Elijah Newren Accepted
[v4,7/7] merge: do not exit restore_state() prematurely Fix merge restore state - - - --- 2022-07-22 Elijah Newren Superseded
[v4,6/7] merge: ensure we can actually restore pre-merge state Fix merge restore state - - - --- 2022-07-22 Elijah Newren Superseded
[v4,5/7] merge: make restore_state() restore staged state too Fix merge restore state - - - --- 2022-07-22 Elijah Newren Superseded
[v4,4/7] merge: fix save_state() to work when there are stat-dirty files Fix merge restore state - - - --- 2022-07-22 Elijah Newren Superseded
[v4,3/7] merge: do not abort early if one strategy fails to handle the merge Fix merge restore state - - - --- 2022-07-22 Elijah Newren Superseded
[v4,2/7] merge-resolve: abort if index does not match HEAD Fix merge restore state - - - --- 2022-07-22 Elijah Newren Superseded
[v4,1/7] merge-ort-wrappers: make printed message match the one from recursive Fix merge restore state - - - --- 2022-07-22 Elijah Newren Superseded
[v3,7/7] merge: do not exit restore_state() prematurely Fix merge restore state - - - --- 2022-07-21 Elijah Newren Superseded
[v3,6/7] merge: ensure we can actually restore pre-merge state Fix merge restore state - - - --- 2022-07-21 Elijah Newren Superseded
[v3,5/7] merge: make restore_state() restore staged state too Fix merge restore state - - - --- 2022-07-21 Elijah Newren Superseded
[v3,4/7] merge: fix save_state() to work when there are stat-dirty files Fix merge restore state - - - --- 2022-07-21 Elijah Newren Superseded
[v3,3/7] merge: do not abort early if one strategy fails to handle the merge Fix merge restore state - - - --- 2022-07-21 Elijah Newren Superseded
[v3,2/7] merge-resolve: abort if index does not match HEAD Fix merge restore state - - - --- 2022-07-21 Elijah Newren Superseded
[v3,1/7] merge-ort-wrappers: make printed message match the one from recursive Fix merge restore state - - - --- 2022-07-21 Elijah Newren Superseded
[v4,5/5] merge-ort: fix issue with dual rename and add/add conflict Fix dual rename into each other plus conflicting adds - - - --- 2022-07-05 Elijah Newren Accepted
[v4,4/5] merge-ort: shuffle the computation and cleanup of potential collisions Fix dual rename into each other plus conflicting adds - - - --- 2022-07-05 Elijah Newren Accepted
[v4,1/5] t6423: add tests of dual directory rename plus add/add conflict Fix dual rename into each other plus conflicting adds - - - --- 2022-07-05 Elijah Newren Accepted
[v3,5/5] merge-ort: fix issue with dual rename and add/add conflict Fix dual rename into each other plus conflicting adds - - - --- 2022-07-01 Elijah Newren Superseded
[v3,4/5] merge-ort: shuffle the computation and cleanup of potential collisions Fix dual rename into each other plus conflicting adds - - - --- 2022-07-01 Elijah Newren Superseded
[v3,1/5] t6423: add tests of dual directory rename plus add/add conflict Fix dual rename into each other plus conflicting adds - - - --- 2022-07-01 Elijah Newren Superseded
[v2,3/3] merge-ort: fix issue with dual rename and add/add conflict Fix dual rename into each other plus conflicting adds - - - --- 2022-06-30 Elijah Newren Superseded
[v2,2/3] merge-ort: shuffle the computation and cleanup of potential collisions Fix dual rename into each other plus conflicting adds - - - --- 2022-06-30 Elijah Newren Superseded
[v2,1/3] t6423: add tests of dual directory rename plus add/add conflict Fix dual rename into each other plus conflicting adds - - - --- 2022-06-30 Elijah Newren Superseded
[3/3] merge-ort: fix issue with dual rename and add/add conflict Fix dual rename into each other plus conflicting adds - - - --- 2022-06-22 Elijah Newren Superseded
[2/3] merge-ort: shuffle the computation and cleanup of potential collisions Fix dual rename into each other plus conflicting adds - - - --- 2022-06-22 Elijah Newren Superseded
[1/3] t6423: add tests of dual directory rename plus add/add conflict Fix dual rename into each other plus conflicting adds - - - --- 2022-06-22 Elijah Newren Superseded
[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,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
[v3,9/9] Documentation: some sparsity wording clarifications sparse-checkout: make cone mode the default - - - --- 2022-04-22 Elijah Newren Accepted
[v3,8/9] git-sparse-checkout.txt: mark non-cone mode as deprecated sparse-checkout: make cone mode the default - - - --- 2022-04-22 Elijah Newren Accepted
[v3,7/9] git-sparse-checkout.txt: flesh out pattern set sections a bit sparse-checkout: make cone mode the default - - - --- 2022-04-22 Elijah Newren Accepted
[v3,6/9] git-sparse-checkout.txt: add a new EXAMPLES section sparse-checkout: make cone mode the default - - - --- 2022-04-22 Elijah Newren Accepted
[v3,5/9] git-sparse-checkout.txt: shuffle some sections and mark as internal sparse-checkout: make cone mode the default - - - --- 2022-04-22 Elijah Newren Accepted
[v3,4/9] git-sparse-checkout.txt: update docs for deprecation of 'init' sparse-checkout: make cone mode the default - - - --- 2022-04-22 Elijah Newren Accepted
[v3,3/9] git-sparse-checkout.txt: wording updates for the cone mode default sparse-checkout: make cone mode the default - - - --- 2022-04-22 Elijah Newren Accepted
[v3,2/9] sparse-checkout: make --cone the default sparse-checkout: make cone mode the default - - - --- 2022-04-22 Elijah Newren Accepted
[v3,1/9] tests: stop assuming --no-cone is the default mode for sparse-checkout sparse-checkout: make cone mode the default - - - --- 2022-04-22 Elijah Newren Accepted
[v2,6/9] git-sparse-checkout.txt: add a new EXAMPLES section sparse-checkout: make cone mode the default - - - --- 2022-03-12 Elijah Newren Accepted
[v2,1/9] tests: stop assuming --no-cone is the default mode for sparse-checkout sparse-checkout: make cone mode the default - - - --- 2022-03-12 Elijah Newren Accepted
[9/9] Documentation: some sparsity wording clarifications sparse-checkout: make cone mode the default - - - --- 2022-03-08 Elijah Newren Superseded
[8/9] git-sparse-checkout.txt: mark non-cone mode as deprecated sparse-checkout: make cone mode the default - - - --- 2022-03-08 Elijah Newren Superseded
[7/9] git-sparse-checkout.txt: flesh out non-cone mode pattern discussion a bit sparse-checkout: make cone mode the default - - - --- 2022-03-08 Elijah Newren Superseded
[6/9] git-sparse-checkout.txt: add a new EXAMPLES section sparse-checkout: make cone mode the default - - - --- 2022-03-08 Elijah Newren Superseded
[5/9] git-sparse-checkout.txt: shuffle some sections and mark as internal sparse-checkout: make cone mode the default - - - --- 2022-03-08 Elijah Newren Superseded
[4/9] git-sparse-checkout.txt: update docs for deprecation of 'init' sparse-checkout: make cone mode the default - - - --- 2022-03-08 Elijah Newren Superseded
[3/9] git-sparse-checkout.txt: wording updates for the cone mode default sparse-checkout: make cone mode the default - - - --- 2022-03-08 Elijah Newren Superseded
[2/9] sparse-checkout: make --cone the default sparse-checkout: make cone mode the default - - - --- 2022-03-08 Elijah Newren Superseded
[1/9] tests: stop assuming --no-cone is the default mode for sparse-checkout sparse-checkout: make cone mode the default - - - --- 2022-03-08 Elijah Newren Superseded
[v5] repo_read_index: add config to expect files outside sparse patterns [v5] repo_read_index: add config to expect files outside sparse patterns - 1 - --- 2022-03-02 Elijah Newren Accepted
merge-ort: exclude messages from inner merges by default merge-ort: exclude messages from inner merges by default - - - --- 2022-03-02 Elijah Newren Accepted
[v4] repo_read_index: add config to expect files outside sparse patterns [v4] repo_read_index: add config to expect files outside sparse patterns - 1 - --- 2022-02-26 Elijah Newren Superseded
[v3] repo_read_index: add config to expect files outside sparse patterns [v3] repo_read_index: add config to expect files outside sparse patterns - 1 - --- 2022-02-24 Elijah Newren Superseded
[v5,12/12] git-merge-tree.txt: add a section on potentional usage mistakes In-core git merge-tree ("Server side merges") - - - --- 2022-02-20 Elijah Newren Superseded
[v5,11/12] merge-tree: add a --allow-unrelated-histories flag In-core git merge-tree ("Server side merges") - - - --- 2022-02-20 Elijah Newren Superseded
[v5,10/12] merge-tree: allow `ls-files -u` style info to be NUL terminated In-core git merge-tree ("Server side merges") - - - --- 2022-02-20 Elijah Newren Superseded
[v5,09/12] merge-tree: provide easy access to `ls-files -u` style info In-core git merge-tree ("Server side merges") - - - --- 2022-02-20 Elijah Newren Superseded
[v5,08/12] merge-tree: provide a list of which files have conflicts In-core git merge-tree ("Server side merges") - - - --- 2022-02-20 Elijah Newren Superseded
[v5,07/12] merge-ort: provide a merge_get_conflicted_files() helper function In-core git merge-tree ("Server side merges") - - - --- 2022-02-20 Elijah Newren Superseded
[v5,06/12] merge-tree: support including merge messages in output In-core git merge-tree ("Server side merges") - - - --- 2022-02-20 Elijah Newren Superseded
[v5,05/12] merge-ort: split out a separate display_update_messages() function In-core git merge-tree ("Server side merges") - - - --- 2022-02-20 Elijah Newren Superseded
[v5,04/12] merge-tree: implement real merges In-core git merge-tree ("Server side merges") - - - --- 2022-02-20 Elijah Newren Superseded
[v5,03/12] merge-tree: add option parsing and initial shell for real merge function In-core git merge-tree ("Server side merges") - - - --- 2022-02-20 Elijah Newren Superseded
« 1 2 ... 4 5 6 … 12 13 »