delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
*	merge-recursive: Fix spurious 'refusing to lose untracked file...' messages	Elijah Newren	2011-08-14	2	-15/+21
*	t6022: Add testcase for spurious "refusing to lose untracked" messages	Elijah Newren	2011-08-14	1	-0/+26
*	t3030: fix accidental success in symlink rename	Jeff King	2011-08-14	1	-2/+5
*	merge-recursive: Fix working copy handling for rename/rename/add/add	Elijah Newren	2011-08-14	2	-26/+58
*	merge-recursive: add handling for rename/rename/add-dest/add-dest	Elijah Newren	2011-08-14	2	-3/+20
*	merge-recursive: Have conflict_rename_delete reuse modify/delete code	Elijah Newren	2011-08-14	1	-16/+30
*	merge-recursive: Make modify/delete handling code reusable	Elijah Newren	2011-08-14	2	-36/+50
*	merge-recursive: Consider modifications in rename/rename(2to1) conflicts	Elijah Newren	2011-08-14	3	-38/+32
*	merge-recursive: Create function for merging with branchname:file markers	Elijah Newren	2011-08-14	1	-9/+33
*	merge-recursive: Record more data needed for merging with dual renames	Elijah Newren	2011-08-14	1	-3/+39
*	merge-recursive: Defer rename/rename(2to1) handling until process_entry	Elijah Newren	2011-08-14	1	-42/+62
*	merge-recursive: Small cleanups for conflict_rename_rename_1to2	Elijah Newren	2011-08-14	1	-33/+27
*	merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base	Elijah Newren	2011-08-14	2	-18/+14
*	merge-recursive: Introduce a merge_file convenience function	Elijah Newren	2011-08-14	1	-35/+37
*	merge-recursive: Fix modify/delete resolution in the recursive case	Elijah Newren	2011-08-14	2	-16/+26
*	merge-recursive: When we detect we can skip an update, actually skip it	Elijah Newren	2011-08-14	2	-5/+18
*	merge-recursive: Provide more info in conflict markers with file renames	Elijah Newren	2011-08-14	3	-8/+97
*	merge-recursive: Cleanup and consolidation of rename_conflict_info	Elijah Newren	2011-08-14	1	-68/+66
*	merge-recursive: Consolidate process_entry() and process_df_entry()	Elijah Newren	2011-08-14	1	-131/+57
*	merge-recursive: Improve handling of rename target vs. directory addition	Elijah Newren	2011-08-14	3	-8/+25
*	merge-recursive: Add comments about handling rename/add-source cases	Elijah Newren	2011-08-14	1	-0/+11
*	merge-recursive: Make dead code for rename/rename(2to1) conflicts undead	Elijah Newren	2011-08-14	2	-30/+57
*	merge-recursive: Fix deletion of untracked file in rename/delete conflicts	Elijah Newren	2011-08-14	2	-2/+3
*	merge-recursive: Split update_stages_and_entry; only update stages at end	Elijah Newren	2011-08-14	1	-18/+17
*	merge-recursive: Allow make_room_for_path() to remove D/F entries	Elijah Newren	2011-08-14	2	-5/+23
*	string-list: Add API to remove an item from an unsorted list	Johannes Sixt	2011-08-14	3	-0/+20
*	merge-recursive: Split was_tracked() out of would_lose_untracked()	Elijah Newren	2011-08-14	1	-3/+8
*	merge-recursive: Save D/F conflict filenames instead of unlinking them	Elijah Newren	2011-08-14	2	-16/+25
*	merge-recursive: Fix code checking for D/F conflicts still being present	Elijah Newren	2011-08-14	1	-15/+34
*	merge-recursive: Fix sorting order and directory change assumptions	Elijah Newren	2011-08-14	2	-13/+53
*	merge-recursive: Fix recursive case with D/F conflict via add/add conflict	Elijah Newren	2011-08-14	2	-2/+4
*	merge-recursive: Avoid working directory changes during recursive case	Elijah Newren	2011-08-14	1	-0/+7
*	merge-recursive: Remember to free generated unique path names	Elijah Newren	2011-08-14	1	-8/+12
*	merge-recursive: Consolidate different update_stages functions	Elijah Newren	2011-08-14	1	-18/+9
*	merge-recursive: Mark some diff_filespec struct arguments const	Elijah Newren	2011-08-14	1	-9/+10
*	merge-recursive: Correct a comment	Elijah Newren	2011-08-14	1	-1/+1
*	merge-recursive: Make BUG message more legible by adding a newline	Elijah Newren	2011-08-14	1	-1/+1
*	t6022: Add testcase for merging a renamed file with a simple change	Elijah Newren	2011-08-14	1	-0/+27
*	t6022: New tests checking for unnecessary updates of files	Elijah Newren	2011-08-14	1	-0/+63
*	t6022: Remove unnecessary untracked files to make test cleaner	Elijah Newren	2011-08-14	1	-0/+1
*	t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify	Elijah Newren	2011-08-14	1	-0/+77
*	t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify	Elijah Newren	2011-08-14	1	-0/+88
*	t6036: tests for criss-cross merges with various directory/file conflicts	Elijah Newren	2011-08-14	1	-0/+159
*	t6036: criss-cross with weird content can fool git into clean merge	Elijah Newren	2011-08-14	1	-0/+83
*	t6036: Add differently resolved modify/delete conflict in criss-cross test	Elijah Newren	2011-08-14	1	-0/+83
*	t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts	Elijah Newren	2011-08-14	1	-0/+125
*	t6042: Ensure rename/rename conflicts leave index and workdir in sane state	Elijah Newren	2011-08-14	1	-0/+102
*	t6042: Add tests for content issues with modify/rename/directory conflicts	Elijah Newren	2011-08-14	1	-0/+141
*	t6042: Add a testcase where undetected rename causes silent file deletion	Elijah Newren	2011-08-14	1	-0/+65
*	t6042: Add a pair of cases where undetected renames cause issues	Elijah Newren	2011-08-14	1	-0/+61