Public Git Hosting - git.git/search

2021-09-20	Elijah Newren	merge-ort: fix completely wrong comment Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-20	Elijah Newren	trace2.h: fix trivial comment typo Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-12	Elijah Newren	tests: remove leftover untracked files Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-10	Elijah Newren	am: fix incorrect exit status on am fail to abort Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-10	Elijah Newren	t4151: add a few am --abort tests Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-10	Elijah Newren	git-am.txt: clarify --abort behavior Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-10	Elijah Newren	stash: restore untracked files AFTER restoring tracked... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-10	Elijah Newren	stash: avoid feeding directories to update-index Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-10	Elijah Newren	t3903: document a pair of directory/file bugs Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-08-05	Elijah Newren	Update docs for change of default merge backend Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-08-05	Elijah Newren	Change default merge backend from recursive to ort Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-08-05	Elijah Newren	Update error message and code comment Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-08-05	Elijah Newren	merge-strategies.txt: add coverage of the `ort` merge... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-08-05	Elijah Newren	git-rebase.txt: correct out-of-date and misleading... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-08-05	Elijah Newren	merge-strategies.txt: fix simple capitalization error Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-08-05	Elijah Newren	merge-strategies.txt: avoid giving special preference... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-08-05	Elijah Newren	merge-strategies.txt: do not imply using copy detection... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-08-05	Elijah Newren	merge-strategies.txt: update wording for the resolve... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-08-05	Elijah Newren	Documentation: edit awkward references to `git merge... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-08-05	Elijah Newren	directory-rename-detection.txt: small updates due to... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-08-05	Elijah Newren	git-rebase.txt: correct antiquated claims about --rebase... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-08-03	Elijah Newren	merge-ort: remove compile-time ability to turn off... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-30	Elijah Newren	merge-ort: reuse path strings in pool_alloc_filespec Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-30	Elijah Newren	merge-ort: store filepairs and filespecs in our mem_pool Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-30	Elijah Newren	diffcore-rename, merge-ort: add wrapper functions for... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-30	Elijah Newren	merge-ort: switch our strmaps over to using memory... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-30	Elijah Newren	merge-ort: set up a memory pool Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-30	Elijah Newren	merge-ort: add pool_alloc, pool_calloc, and pool_strndup... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-30	Elijah Newren	diffcore-rename: use a mem_pool for exact rename detection... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-30	Elijah Newren	merge-ort: rename str{map,intmap,set}_func() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-22	Elijah Newren	pull: fix handling of multiple heads Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-22	Elijah Newren	pull: update docs & code for option compatibility with... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-22	Elijah Newren	pull: abort by default when fast-forwarding is not... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-22	Elijah Newren	pull: make --rebase and --no-rebase override pull.ff... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-22	Elijah Newren	pull: since --ff-only overrides, handle it first Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-21	Elijah Newren	t7601: add tests of interactions with multiple merge... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-21	Elijah Newren	t7601: test interaction of merge/rebase/fast-forward... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-20	Elijah Newren	merge-ort: restart merge with cached renames to reduce... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-20	Elijah Newren	merge-ort: avoid recursing into directories when we... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-20	Elijah Newren	merge-ort: defer recursing into directories when merge... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-20	Elijah Newren	merge-ort: add a handle_deferred_entries() helper function Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-20	Elijah Newren	merge-ort: add data structures for allowable trivial... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-20	Elijah Newren	merge-ort: add some more explanations in collect_merge_info_... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-20	Elijah Newren	merge-ort: resolve paths early when we have sufficient... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-15	Elijah Newren	rename: bump limit defaults yet again Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-15	Elijah Newren	diffcore-rename: treat a rename_limit of 0 as unlimited Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-15	Elijah Newren	doc: clarify documentation for rename/copy limits Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-07-15	Elijah Newren	diff: correct warning message when renameLimit exceeded Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-06-30	Elijah Newren	merge-recursive: handle rename-to-self case Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-06-30	Elijah Newren	merge-ort: ensure we consult df_conflict and path_conflicts Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-06-30	Elijah Newren	t6423: test directory renames causing rename-to-self Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-06-28	Elijah Newren	merge-ort: add prefetching for content merges Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-06-28	Elijah Newren	diffcore-rename: use a different prefetch for basename... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-06-28	Elijah Newren	diffcore-rename: allow different missing_object_cb... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-06-28	Elijah Newren	t6421: add tests checking for excessive object downloads... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-06-16	Elijah Newren	promisor-remote: output trace2 statistics for number... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-06-09	Elijah Newren	merge-ort: miscellaneous touch-ups Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-06-09	Elijah Newren	Fix various issues found in comments Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-06-09	Elijah Newren	diffcore-rename: avoid unnecessary strdup'ing in break_idx Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-06-09	Elijah Newren	merge-ort: replace string_list_df_name_compare with... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-27	Elijah Newren	dir: introduce readdir_skip_dot_and_dotdot() helper Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-20	Elijah Newren	merge-ort, diffcore-rename: employ cached renames when... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-20	Elijah Newren	merge-ort: handle interactions of caching and rename... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-20	Elijah Newren	merge-ort: add helper functions for using cached renames Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-20	Elijah Newren	merge-ort: preserve cached renames for the appropriate... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-20	Elijah Newren	merge-ort: avoid accidental API mis-use Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-20	Elijah Newren	merge-ort: add code to check for whether cached renames... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-20	Elijah Newren	merge-ort: populate caches of rename detection results Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-20	Elijah Newren	merge-ort: add data structures for in-memory caching... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-20	Elijah Newren	t6429: testcases for remembering renames Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-20	Elijah Newren	fast-rebase: write conflict state to working tree,... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-20	Elijah Newren	fast-rebase: change assert() to BUG() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-20	Elijah Newren	Documentation/technical: describe remembering renames... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-13	Elijah Newren	git-prompt: work under set -u Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-12	Elijah Newren	dir: introduce readdir_skip_dot_and_dotdot() helper Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-12	Elijah Newren	dir: traverse into untracked directories if they may... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-12	Elijah Newren	dir: avoid unnecessary traversal into ignored directory Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-12	Elijah Newren	t3001, t7300: add testcase showcasing missed directory... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-12	Elijah Newren	t7300: add testcase showing unnecessary traversal into... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-12	Elijah Newren	ls-files: error out on -i unless -o or -c are specified Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-12	Elijah Newren	dir: report number of visited directories and paths... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-12	Elijah Newren	dir: convert trace calls to trace2 equivalents Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-05-04	Elijah Newren	t6423: rename file within directory that other side... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-31	Elijah Newren	sequencer: fix edit handling for cherry-pick and revert... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-20	Elijah Newren	Add testing with merge-ort merge strategy Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-20	Elijah Newren	t6423: mark remaining expected failure under merge... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-20	Elijah Newren	Revert "merge-ort: ignore the directory rename split... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-20	Elijah Newren	merge-recursive: add a bunch of FIXME comments documenting... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-20	Elijah Newren	merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-20	Elijah Newren	t: mark several submodule merging tests as fixed under... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-20	Elijah Newren	merge-ort: implement CE_SKIP_WORKTREE handling with... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-20	Elijah Newren	t6428: new test for SKIP_WORKTREE handling and conflicts Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-20	Elijah Newren	merge-ort: support subtree shifting Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-20	Elijah Newren	merge-ort: let renormalization change modify/delete... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-20	Elijah Newren	merge-ort: have ll_merge() use a special attr_index... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-20	Elijah Newren	merge-ort: add a special minimal index just for renormalization Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-20	Elijah Newren	merge-ort: use STABLE_QSORT instead of QSORT where... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-18	Elijah Newren	diffcore-rename: determine which relevant_sources are... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-18	Elijah Newren	merge-ort: record the reason that we want a rename... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-03-18	Elijah Newren	diffcore-rename: add computation of number of unknown... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
next

The Best VCS Around

RSS Atom