Show patches with: Submitter = Elijah Newren       |    State = Action Required       |   769 patches
« 1 2 3 4 … 7 8 »
Patch Series A/R/T S/W/F Date Submitter Delegate State
[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) - - - --- 2021-12-31 Elijah Newren New
[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) - - - --- 2021-12-31 Elijah Newren New
[v2,8/8] show, log: include conflict/warning messages in --remerge-diff headers Add a new --remerge-diff capability to show & log - - - --- 2021-12-25 Elijah Newren New
[v2,7/8] diff: add ability to insert additional headers for paths Add a new --remerge-diff capability to show & log - - - --- 2021-12-25 Elijah Newren New
[v2,6/8] merge-ort: format messages slightly different for use in headers Add a new --remerge-diff capability to show & log - - - --- 2021-12-25 Elijah Newren New
[v2,3/8] ll-merge: make callers responsible for showing warnings Add a new --remerge-diff capability to show & log - - - --- 2021-12-25 Elijah Newren New
[v2,2/8] log: clean unneeded objects during `log --remerge-diff` Add a new --remerge-diff capability to show & log - - - --- 2021-12-25 Elijah Newren New
[v2,1/8] show, log: provide a --remerge-diff capability Add a new --remerge-diff capability to show & log - - - --- 2021-12-25 Elijah Newren New
[v4,11/11] t2501: simplify the tests since we can now assume desired behavior Avoid removing the current working directory, even if it becomes empty - - - --- 2021-11-29 Elijah Newren New
[v4,10/11] dir: new flag to remove_dir_recurse() to spare the original_cwd Avoid removing the current working directory, even if it becomes empty - - - --- 2021-11-29 Elijah Newren New
[v4,01/11] t2501: add various tests for removing the current working directory Avoid removing the current working directory, even if it becomes empty - - - --- 2021-11-29 Elijah Newren New
[6/6] Documentation: call out commands that nuke untracked files/directories Fix various issues around removal of untracked files/directories - - - --- 2021-09-18 Elijah Newren New
[5/6] Comment important codepaths regarding nuking untracked files/dirs Fix various issues around removal of untracked files/directories - - - --- 2021-09-18 Elijah Newren New
[4/6] unpack-trees: avoid nuking untracked dir in way of locally deleted file Fix various issues around removal of untracked files/directories - - - --- 2021-09-18 Elijah Newren New
[3/6] unpack-trees: avoid nuking untracked dir in way of unmerged file Fix various issues around removal of untracked files/directories - - - --- 2021-09-18 Elijah Newren New
[2/6] Split unpack_trees 'reset' flag into two for untracked handling Fix various issues around removal of untracked files/directories - - - --- 2021-09-18 Elijah Newren New
[1/6] t2500: add various tests for nuking untracked files Fix various issues around removal of untracked files/directories - - - --- 2021-09-18 Elijah Newren New
[v3,2/2] update documentation for new zdiff3 conflictStyle RFC: implement new zdiff3 conflict style - - - --- 2021-09-18 Elijah Newren New
[v3,1/2] xdiff: implement a zealous diff3, or "zdiff3" RFC: implement new zdiff3 conflict style - - - --- 2021-09-18 Elijah Newren New
rebase, cherry-pick, revert: only run from toplevel rebase, cherry-pick, revert: only run from toplevel - - - --- 2021-08-31 Elijah Newren New
[7/7] doc/diff-options: explain the new --remerge-diff option Add a new --remerge-diff capability to show & log - - - --- 2021-08-31 Elijah Newren New
[6/7] show, log: provide a --remerge-diff capability Add a new --remerge-diff capability to show & log - - - --- 2021-08-31 Elijah Newren New
[5/7] tmp-objdir: new API for creating and removing primary object dirs Add a new --remerge-diff capability to show & log - - - --- 2021-08-31 Elijah Newren New
[4/7] merge-ort: capture and print ll-merge warnings in our preferred fashion Add a new --remerge-diff capability to show & log - - - --- 2021-08-31 Elijah Newren New
[3/7] ll-merge: add API for capturing warnings in a strbuf instead of stderr Add a new --remerge-diff capability to show & log - - - --- 2021-08-31 Elijah Newren New
[2/7] merge-ort: add ability to record conflict messages in a file Add a new --remerge-diff capability to show & log - - - --- 2021-08-31 Elijah Newren New
[1/7] merge-ort: mark a few more conflict messages as omittable Add a new --remerge-diff capability to show & log - - - --- 2021-08-31 Elijah Newren New
[2/2] Update docs for change of default merge backend Switch default merge backend from recursive to ort - - - --- 2021-08-04 Elijah Newren New
[1/2] Change default merge backend from recursive to ort Switch default merge backend from recursive to ort - - - --- 2021-08-04 Elijah Newren New
[v3,9/9] merge-ort: remove compile-time ability to turn off usage of memory pools Final optimization batch (#15): use memory pools - - - --- 2021-07-30 Elijah Newren New
[v3,8/9] merge-ort: reuse path strings in pool_alloc_filespec Final optimization batch (#15): use memory pools - - - --- 2021-07-30 Elijah Newren New
[v3,7/9] merge-ort: store filepairs and filespecs in our mem_pool Final optimization batch (#15): use memory pools - - - --- 2021-07-30 Elijah Newren New
[v3,6/9] diffcore-rename, merge-ort: add wrapper functions for filepair alloc/dealloc Final optimization batch (#15): use memory pools - - - --- 2021-07-30 Elijah Newren New
[v3,5/9] merge-ort: switch our strmaps over to using memory pools Final optimization batch (#15): use memory pools - - - --- 2021-07-30 Elijah Newren New
[v3,4/9] merge-ort: set up a memory pool Final optimization batch (#15): use memory pools - - - --- 2021-07-30 Elijah Newren New
[v3,3/9] merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappers Final optimization batch (#15): use memory pools - - - --- 2021-07-30 Elijah Newren New
[v3,2/9] diffcore-rename: use a mem_pool for exact rename detection's hashmap Final optimization batch (#15): use memory pools - - - --- 2021-07-30 Elijah Newren New
[v3,1/9] merge-ort: rename str{map,intmap,set}_func() Final optimization batch (#15): use memory pools - - - --- 2021-07-30 Elijah Newren New
[v3,8/8] pull: fix handling of multiple heads Handle pull option precedence - - - --- 2021-07-22 Elijah Newren New
[v3,7/8] pull: update docs & code for option compatibility with rebasing Handle pull option precedence - - - --- 2021-07-22 Elijah Newren New
[v3,6/8] pull: abort by default when fast-forwarding is not possible Handle pull option precedence - - - --- 2021-07-22 Elijah Newren New
[v3,5/8] pull: make --rebase and --no-rebase override pull.ff=only Handle pull option precedence - - - --- 2021-07-22 Elijah Newren New
[v3,4/8] pull: since --ff-only overrides, handle it first Handle pull option precedence - - - --- 2021-07-22 Elijah Newren New
[v3,2/8] t7601: add tests of interactions with multiple merge heads and config Handle pull option precedence - - - --- 2021-07-22 Elijah Newren New
[v3,1/8] t7601: test interaction of merge/rebase/fast-forward flags and options Handle pull option precedence - - - --- 2021-07-22 Elijah Newren New
[v2,8/8] pull: fix handling of multiple heads Handle pull option precedence - - - --- 2021-07-21 Elijah Newren New
[v2,7/8] pull: update docs & code for option compatibility with rebasing Handle pull option precedence - - - --- 2021-07-21 Elijah Newren New
[v2,6/8] pull: abort by default when fast-forwarding is not possible Handle pull option precedence - - - --- 2021-07-21 Elijah Newren New
[v2,5/8] pull: make --rebase and --no-rebase override pull.ff=only Handle pull option precedence - - - --- 2021-07-21 Elijah Newren New
[v2,4/8] pull: since --ff-only overrides, handle it first Handle pull option precedence - - - --- 2021-07-21 Elijah Newren New
[v2,2/8] t7601: add tests of interactions with multiple merge heads and config Handle pull option precedence - - - --- 2021-07-21 Elijah Newren New
[v2,1/8] t7601: test interaction of merge/rebase/fast-forward flags and options Handle pull option precedence - - - --- 2021-07-21 Elijah Newren New
[9/9] pull: fix handling of multiple heads Handle pull option precedence - - - --- 2021-07-17 Elijah Newren New
[8/9] pull: update docs & code for option compatibility with rebasing Handle pull option precedence - - - --- 2021-07-17 Elijah Newren New
[7/9] pull: abort by default when fast-forwarding is not possible Handle pull option precedence - - - --- 2021-07-17 Elijah Newren New
[6/9] pull: make --rebase and --no-rebase override pull.ff=only Handle pull option precedence - - - --- 2021-07-17 Elijah Newren New
[5/9] pull: ensure --rebase overrides ability to ff Handle pull option precedence - - - --- 2021-07-17 Elijah Newren New
[4/9] pull: since --ff-only overrides, handle it first Handle pull option precedence - - - --- 2021-07-17 Elijah Newren New
[2/9] t7601: add tests of interactions with multiple merge heads and config Handle pull option precedence - - - --- 2021-07-17 Elijah Newren New
[1/9] t7601: add relative precedence tests for merge and rebase flags/options Handle pull option precedence - - - --- 2021-07-17 Elijah Newren New
[5/5] pull: abort by default when fast-forwarding is not possible Handle conflicting pull options - - - --- 2021-07-15 Elijah Newren New
[3/5] pull: handle conflicting rebase/merge options via last option wins Handle conflicting pull options - - - --- 2021-07-15 Elijah Newren New
[2/5] pull: convert OPT_PASSTHRU for fast-forward options to OPT_CALLBACK Handle conflicting pull options - - - --- 2021-07-15 Elijah Newren New
[1/5] pull: move definitions of parse_config_rebase and parse_opt_rebase Handle conflicting pull options - - - --- 2021-07-15 Elijah Newren New
[v2,7/7] merge-ort: restart merge with cached renames to reduce process entry cost Optimization batch 14: trivial directory resolution - - - --- 2021-07-13 Elijah Newren New
[v2,6/7] merge-ort: avoid recursing into directories when we don't need to Optimization batch 14: trivial directory resolution - - - --- 2021-07-13 Elijah Newren New
[v2,5/7] merge-ort: defer recursing into directories when merge base is matched Optimization batch 14: trivial directory resolution - - - --- 2021-07-13 Elijah Newren New
[v2,4/7] merge-ort: add a handle_deferred_entries() helper function Optimization batch 14: trivial directory resolution - - - --- 2021-07-13 Elijah Newren New
[v2,3/7] merge-ort: add data structures for allowable trivial directory resolves Optimization batch 14: trivial directory resolution - - - --- 2021-07-13 Elijah Newren New
[v2,2/7] merge-ort: add some more explanations in collect_merge_info_callback() Optimization batch 14: trivial directory resolution - - - --- 2021-07-13 Elijah Newren New
[v2,1/7] merge-ort: resolve paths early when we have sufficient information Optimization batch 14: trivial directory resolution - - - --- 2021-07-13 Elijah Newren New
[3/3] diff: correct warning message when renameLimit exceeded Improve the documentation and warnings dealing with rename/copy limits - - - --- 2021-07-11 Elijah Newren New
[2/3] doc: document the special handling of -l0 Improve the documentation and warnings dealing with rename/copy limits - - - --- 2021-07-11 Elijah Newren New
[1/3] doc: clarify documentation for rename/copy limits Improve the documentation and warnings dealing with rename/copy limits - - - --- 2021-07-11 Elijah Newren New
[3/3] merge-recursive: handle rename-to-self case Fix bugs from interesting renaming pairs: one side renames A/file -> B/file, the other B/ -> A/ - - - --- 2021-06-26 Elijah Newren New
[2/3] merge-ort: ensure we consult df_conflict and path_conflicts Fix bugs from interesting renaming pairs: one side renames A/file -> B/file, the other B/ -> A/ - - - --- 2021-06-26 Elijah Newren New
[1/3] t6423: test directory renames causing rename-to-self Fix bugs from interesting renaming pairs: one side renames A/file -> B/file, the other B/ -> A/ - - - --- 2021-06-26 Elijah Newren New
[v2,5/5] merge-ort: add prefetching for content merges Optimization batch 13: partial clone optimizations for merge-ort - - - --- 2021-06-15 Elijah Newren New
[v2,4/5] diffcore-rename: use a different prefetch for basename comparisons Optimization batch 13: partial clone optimizations for merge-ort - - - --- 2021-06-15 Elijah Newren New
[v2,3/5] diffcore-rename: allow different missing_object_cb functions Optimization batch 13: partial clone optimizations for merge-ort - - - --- 2021-06-15 Elijah Newren New
[v2,2/5] t6421: add tests checking for excessive object downloads during merge Optimization batch 13: partial clone optimizations for merge-ort - - - --- 2021-06-15 Elijah Newren New
[v2,1/5] promisor-remote: output trace2 statistics for number of objects fetched Optimization batch 13: partial clone optimizations for merge-ort - - - --- 2021-06-15 Elijah Newren New
[2/2] update documentation for new zdiff3 conflictStyle RFC: implement new zdiff3 conflict style - - - --- 2021-06-15 Elijah Newren New
[1/2] xdiff: implement a zealous diff3, or "zdiff3" RFC: implement new zdiff3 conflict style - - - --- 2021-06-15 Elijah Newren New
[v2,5/5] merge-ort: miscellaneous touch-ups Optimization batch 12: miscellaneous unthemed stuff - - - --- 2021-06-01 Elijah Newren New
[v2,4/5] Fix various issues found in comments Optimization batch 12: miscellaneous unthemed stuff - - - --- 2021-06-01 Elijah Newren New
[v2,3/5] diffcore-rename: enable limiting rename detection to relevant destinations Optimization batch 12: miscellaneous unthemed stuff - - - --- 2021-06-01 Elijah Newren New
[v2,2/5] diffcore-rename: avoid unnecessary strdup'ing in break_idx Optimization batch 12: miscellaneous unthemed stuff - - - --- 2021-06-01 Elijah Newren New
[v2,1/5] merge-ort: replace string_list_df_name_compare with faster alternative Optimization batch 12: miscellaneous unthemed stuff - - - --- 2021-06-01 Elijah Newren New
[7/7] merge-ort, diffcore-rename: employ cached renames when possible Optimization batch 11: avoid repeatedly detecting same renames - - - --- 2021-03-24 Elijah Newren New
[6/7] merge-ort: add helper functions for using cached renames Optimization batch 11: avoid repeatedly detecting same renames - - - --- 2021-03-24 Elijah Newren New
[5/7] merge-ort: preserve cached renames for the appropriate side Optimization batch 11: avoid repeatedly detecting same renames - - - --- 2021-03-24 Elijah Newren New
[4/7] merge-ort: avoid accidental API mis-use Optimization batch 11: avoid repeatedly detecting same renames - - - --- 2021-03-24 Elijah Newren New
[3/7] merge-ort: add code to check for whether cached renames can be reused Optimization batch 11: avoid repeatedly detecting same renames - - - --- 2021-03-24 Elijah Newren New
[2/7] merge-ort: populate caches of rename detection results Optimization batch 11: avoid repeatedly detecting same renames - - - --- 2021-03-24 Elijah Newren New
[1/7] merge-ort: add data structures for in-memory caching of rename detection Optimization batch 11: avoid repeatedly detecting same renames - - - --- 2021-03-24 Elijah Newren New
[v2,13/13] Add testing with merge-ort merge strategy Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New
[v2,12/13] t6423: mark remaining expected failure under merge-ort as such Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New
[v2,11/13] Revert "merge-ort: ignore the directory rename split conflict for now" Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New
[v2,10/13] merge-recursive: add a bunch of FIXME comments documenting known bugs Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New
« 1 2 3 4 … 7 8 »