Show patches with: Submitter = Elijah Newren       |   2069 patches
« 1 2 ... 4 5 620 21 »
Patch Series A/R/T S/W/F Date Submitter Delegate State
[v3,4/7] rebase: fix docs about incompatibilities with --root rebase: fix several code/testing/documentation issues around flag incompatibilities - - - --- 2023-01-21 Elijah Newren Superseded
[v3,3/7] rebase: remove --allow-empty-message from incompatible opts rebase: fix several code/testing/documentation issues around flag incompatibilities - - - --- 2023-01-21 Elijah Newren Superseded
[v3,2/7] rebase: flag --apply and --merge as incompatible rebase: fix several code/testing/documentation issues around flag incompatibilities - - - --- 2023-01-21 Elijah Newren Superseded
[v3,1/7] rebase: mark --update-refs as requiring the merge backend rebase: fix several code/testing/documentation issues around flag incompatibilities - - - --- 2023-01-21 Elijah Newren Superseded
[v2,2/2] rebase: mark --update-refs as requiring the merge backend rebase: mark --update-refs as requiring the merge backend - - - --- 2023-01-20 Elijah Newren New
[v2,1/2] rebase: remove completely useless -C option rebase: mark --update-refs as requiring the merge backend - - - --- 2023-01-20 Elijah Newren New
rebase: mark --update-refs as requiring the merge backend rebase: mark --update-refs as requiring the merge backend - - - --- 2023-01-19 Elijah Newren New
[v2] t6426: fix TODO about making test more comprehensive [v2] t6426: fix TODO about making test more comprehensive - - - --- 2023-01-14 Elijah Newren Accepted
[4/4] ls-files: guide folks to --exclude-standard over other --exclude* options clarify ls-files docs - - - --- 2023-01-13 Elijah Newren Accepted
[3/4] ls-files: clarify descriptions of status tags for -t clarify ls-files docs - - - --- 2023-01-13 Elijah Newren Accepted
[2/4] ls-files: clarify descriptions of file selection options clarify ls-files docs - - - --- 2023-01-13 Elijah Newren Accepted
[1/4] ls-files: add missing documentation for --resolve-undo option clarify ls-files docs - - - --- 2023-01-13 Elijah Newren Accepted
t6426: fix TODO about making test more comprehensive t6426: fix TODO about making test more comprehensive - - - --- 2023-01-13 Elijah Newren Superseded
[v4] sparse-checkout.txt: new document with sparse-checkout directions [v4] sparse-checkout.txt: new document with sparse-checkout directions - - - --- 2022-11-06 Elijah Newren Accepted
[2/2] merge-tree: support multiple batched merges with --stdin merge-tree: batched merges - - - --- 2022-10-23 Elijah Newren Accepted
[1/2] merge-tree: update documentation for differences in -z output merge-tree: batched merges - - - --- 2022-10-23 Elijah Newren Accepted
merge-ort: fix bug with dir rename vs change dir to symlink merge-ort: fix bug with dir rename vs change dir to symlink - - - --- 2022-10-22 Elijah Newren Accepted
sparse-checkout.txt: new document with sparse-checkout directions sparse-checkout.txt: new document with sparse-checkout directions - - - --- 2022-09-25 Elijah Newren New
[v3,3/3] diff: fix filtering of merge commits under --remerge-diff Output fixes for --remerge-diff - - - --- 2022-09-02 Elijah Newren Accepted
[v3,2/3] diff: fix filtering of additional headers under --remerge-diff Output fixes for --remerge-diff - - - --- 2022-09-02 Elijah Newren Accepted
[v3,1/3] diff: have submodule_format logic avoid additional diff headers Output fixes for --remerge-diff - - - --- 2022-09-02 Elijah Newren Accepted
[v2,3/3] diff: fix filtering of merge commits under --remerge-diff Output fixes for --remerge-diff - - - --- 2022-09-01 Elijah Newren Accepted
[v2,2/3] diff: fix filtering of additional headers under --remerge-diff Output fixes for --remerge-diff - - - --- 2022-09-01 Elijah Newren Accepted
[v2,1/3] diff: have submodule_format logic avoid additional diff headers Output fixes for --remerge-diff - - - --- 2022-09-01 Elijah Newren New
[3/3] diff: fix filtering of merge commits under --remerge-diff Output fixes for --remerge-diff - - - --- 2022-08-31 Elijah Newren Superseded
[2/3] diff: fix filtering of additional headers under --remerge-diff Output fixes for --remerge-diff - - - --- 2022-08-31 Elijah Newren Superseded
[1/3] diff: have submodule_format logic avoid additional diff headers Output fixes for --remerge-diff - - - --- 2022-08-31 Elijah Newren Superseded
[v2] t64xx: convert 'test_create_repo' to 'git init' [v2] t64xx: convert 'test_create_repo' to 'git init' - 1 - --- 2022-08-26 Elijah Newren Accepted
t4301: add more interesting merge-tree testcases t4301: add more interesting merge-tree testcases - - - --- 2022-08-23 Elijah Newren Accepted
[v2,3/3] merge: small code readability improvement Miscellaneous merge fixes - - - --- 2022-08-23 Elijah Newren Accepted
[v2,2/3] merge: cleanup confusing logic for handling successful merges Miscellaneous merge fixes - - - --- 2022-08-23 Elijah Newren Accepted
[v2,1/3] merge: only apply autostash when appropriate Miscellaneous merge fixes - - - --- 2022-08-23 Elijah Newren Accepted
[2/2] merge: avoid searching for strategies with fewer than 0 conflicts Miscellaneous merge fixes - - - --- 2022-08-21 Elijah Newren Superseded
[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
[2/2] revision: allow --ancestry-path to take an argument Allow --ancestry-path to take an argument - - - --- 2022-08-17 Elijah Newren New
[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
[v2,6/6] merge: do not exit restore_state() prematurely Fix merge restore state - - - --- 2022-06-19 Elijah Newren New
[v2,5/6] merge: ensure we can actually restore pre-merge state Fix merge restore state - - - --- 2022-06-19 Elijah Newren New
[v2,4/6] merge: make restore_state() restore staged state too Fix merge restore state - - - --- 2022-06-19 Elijah Newren New
[v2,3/6] merge: fix save_state() to work when there are racy-dirty files Fix merge restore state - - - --- 2022-06-19 Elijah Newren New
[v2,2/6] merge: remove unused variable Fix merge restore state - - - --- 2022-06-19 Elijah Newren New
[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
« 1 2 ... 4 5 620 21 »