git.uis.cam.ac.uk - uis - git/git.git/search

/ uis / git / x / uis / git / git.git / search

2018-06-13	Elijah Newren	RelNotes 2.18: clarify where directory rename detection... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-06-01	Elijah Newren	RelNotes: remove duplicate release note Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-25	Elijah Newren	rev-parse: check lookup'ed commit references for NULL Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-20	Elijah Newren	merge-recursive: provide pair of `unpack_trees_{start... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: fix check for skipability of working... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: make "Auto-merging" comment show for... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: fix remainder of was_dirty() to use... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: fix was_tracked() to quit lying with... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	t6046: testcases checking whether updates can be skipped... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: avoid triggering add_cacheinfo error... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: move more is_dirty handling to merge_content Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: improve add_cacheinfo error handling Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: avoid spurious rename/rename conflict... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	directory rename detection: new testcases showcasing... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: fix remaining directory rename + dirty... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: fix overwriting dirty files involved... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: avoid clobbering untracked files with... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: apply necessary modifications for... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: when comparing files, don't include... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: check for file level conflicts then... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: add computation of collisions due... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: check for directory level conflicts Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-08	Elijah Newren	merge-recursive: add get_directory_renames() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-05-02	Elijah Newren	unpack_trees: fix breakage when o->src_index != o-... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-25	Elijah Newren	Make running git under other debugger-like programs... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	merge-recursive: make a helper function for cleanup... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	merge-recursive: split out code for determining diff_filepairs Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	merge-recursive: make !o->detect_rename codepath more... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	merge-recursive: fix leaks of allocated renames and... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	merge-recursive: introduce new functions to handle... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	merge-recursive: move the get_renames() function Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	directory rename detection: tests for handling overwriting... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	directory rename detection: tests for handling overwriting... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	directory rename detection: miscellaneous testcases... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	directory rename detection: testcases exploring possibly... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	directory rename detection: more involved edge/corner... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	directory rename detection: testcases checking which... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	directory rename detection: files/directories in the... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	directory rename detection: partially renamed directory... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	directory rename detection: testcases to avoid taking... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	directory rename detection: directory splitting testcases Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-20	Elijah Newren	directory rename detection: basic testcases Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-09	Elijah Newren	Documentation: normalize spelling of 'normalised' Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-04-09	Elijah Newren	Documentation: fix several one-character-off spelling... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-27	Elijah Newren	merge-recursive: ensure we write updates for directory... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-27	Elijah Newren	merge-recursive: avoid spurious rename/rename conflict... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-27	Elijah Newren	directory rename detection: new testcases showcasing... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-27	Elijah Newren	merge-recursive: fix remaining directory rename + dirty... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-27	Elijah Newren	merge-recursive: fix overwriting dirty files involved... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-27	Elijah Newren	merge-recursive: avoid clobbering untracked files with... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-27	Elijah Newren	merge-recursive: apply necessary modifications for... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	merge-recursive: when comparing files, don't include... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	merge-recursive: check for file level conflicts then... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	merge-recursive: add computation of collisions due... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	merge-recursive: check for directory level conflicts Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	merge-recursive: add get_directory_renames() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	merge-recursive: make a helper function for cleanup... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	merge-recursive: split out code for determining diff_filepairs Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	merge-recursive: make !o->detect_rename codepath more... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	merge-recursive: fix leaks of allocated renames and... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	merge-recursive: introduce new functions to handle... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	merge-recursive: move the get_renames() function Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	directory rename detection: tests for handling overwriting... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	directory rename detection: tests for handling overwriting... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	directory rename detection: miscellaneous testcases... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	directory rename detection: testcases exploring possibly... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	directory rename detection: more involved edge/corner... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	directory rename detection: testcases checking which... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	directory rename detection: files/directories in the... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	directory rename detection: partially renamed directory... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	directory rename detection: testcases to avoid taking... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	directory rename detection: directory splitting testcases Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-02-14	Elijah Newren	directory rename detection: basic testcases Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-01-19	Elijah Newren	merge-recursive: add explanation for src_entry and... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-01-19	Elijah Newren	merge-recursive: fix logic ordering issue Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-01-19	Elijah Newren	Tighten and correct a few testcases for merging and... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2017-12-22	Elijah Newren	merge-recursive: avoid incorporating uncommitted changes... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2017-12-22	Elijah Newren	move index_has_changes() from builtin/am.c to merge... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2017-12-22	Elijah Newren	t6044: recursive can silently incorporate dirty changes... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2017-12-05	Elijah Newren	strbuf: remove unused stripspace function alias Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2017-11-27	Elijah Newren	merge-recursive: ignore_case shouldn't reject intentional... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2017-11-15	Elijah Newren	sequencer: show rename progress during cherry picks Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2017-11-15	Elijah Newren	diff: remove silent clamp of renameLimit Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2017-11-15	Elijah Newren	progress: fix progress meters when dealing with lots... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2017-11-15	Elijah Newren	merge-recursive: handle addition of submodule on our... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2017-11-14	Elijah Newren	sequencer: warn when internal merge may be suboptimal... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2016-04-13	Elijah Newren	t6044: new merge testcases for when index doesn't match... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2016-04-13	Elijah Newren	merge-octopus: abort if index does not match HEAD Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2016-04-13	Elijah Newren	builtin/merge.c: fix a bug with trivial merges Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2016-04-13	Elijah Newren	t7605: add a testcase demonstrating a bug with trivial... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2016-04-13	Elijah Newren	merge-recursive: do not check working copy when creating... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2016-04-13	Elijah Newren	merge-recursive: remove duplicate code Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Don't re-sort a list whose order we... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Fix virtual merge base for rename... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6036: criss-cross + rename/rename(1to2)/add-dest ... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Avoid unnecessary file rewrites Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6022: Additional tests checking for unnecessary updates... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Fix spurious 'refusing to lose untracked... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	t6022: Add testcase for spurious "refusing to lose... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2011-08-14	Elijah Newren	merge-recursive: Fix working copy handling for rename... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
next

Local mirror of git

RSS Atom