summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-03-02t6022: New test checking for unnecessary updates of files in D/F conflictsLibravatar Elijah Newren1-0/+33
2011-03-02t6022: New test checking for unnecessary updates of renamed+modified filesLibravatar Elijah Newren1-0/+30
2010-11-17t6022: Use -eq not = to test output of wc -lLibravatar Brian Gernhardt1-32/+32
2010-10-21merge-recursive:make_room_for_directories - work around dumb compilersLibravatar Junio C Hamano1-1/+1
2010-09-29merge-recursive: Remove redundant path clearing for D/F conflictsLibravatar Elijah Newren1-15/+2
2010-09-29merge-recursive: Make room for directories in D/F conflictsLibravatar Elijah Newren2-1/+59
2010-09-29handle_delete_modify(): Check whether D/F conflicts are still presentLibravatar Elijah Newren2-10/+17
2010-09-29merge_content(): Check whether D/F conflicts are still presentLibravatar Elijah Newren2-6/+24
2010-09-29conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsLibravatar Elijah Newren2-5/+4
2010-09-29conflict_rename_delete(): Check whether D/F conflicts are still presentLibravatar Elijah Newren2-2/+10
2010-09-29merge-recursive: Delay modify/delete conflicts if D/F conflict presentLibravatar Elijah Newren1-0/+9
2010-09-29merge-recursive: Delay content merging for renamesLibravatar Elijah Newren2-37/+16
2010-09-29merge-recursive: Delay handling of rename/delete conflictsLibravatar Elijah Newren1-2/+20
2010-09-29merge-recursive: Move handling of double rename of one file to other fileLibravatar Elijah Newren1-26/+6
2010-09-29merge-recursive: Move handling of double rename of one file to twoLibravatar Elijah Newren2-17/+42
2010-09-29merge-recursive: Avoid doubly merging rename/add conflict contentsLibravatar Elijah Newren2-2/+3
2010-09-29merge-recursive: Update merge_content() call signatureLibravatar Elijah Newren1-2/+4
2010-09-29merge-recursive: Update conflict_rename_rename_1to2() call signatureLibravatar Elijah Newren1-9/+9
2010-09-29merge-recursive: Structure process_df_entry() to handle more casesLibravatar Elijah Newren1-36/+47
2010-09-29merge-recursive: Have process_entry() skip D/F or rename entriesLibravatar Elijah Newren1-0/+3
2010-09-29merge-recursive: New function to assist resolving renames in-core onlyLibravatar Elijah Newren1-3/+30
2010-09-29merge-recursive: New data structures for deferring of D/F conflictsLibravatar Elijah Newren1-0/+44
2010-09-29merge-recursive: Move process_entry's content merging into a functionLibravatar Elijah Newren1-28/+43
2010-09-29merge-recursive: Move delete/modify handling into dedicated functionLibravatar Elijah Newren1-13/+22
2010-09-29merge-recursive: Move rename/delete handling into dedicated functionLibravatar Elijah Newren1-11/+20
2010-09-29merge-recursive: Nuke rename/directory conflict detectionLibravatar Elijah Newren1-18/+0
2010-09-29merge-recursive: Rename conflict_rename_rename*() for clarityLibravatar Elijah Newren1-12/+14
2010-09-29merge-recursive: Small code clarification -- variable name and commentsLibravatar Elijah Newren1-6/+14
2010-09-29t6036: Add testcase for undetected conflictLibravatar Elijah Newren1-0/+85
2010-09-29t6036: Add a second testcase similar to the first but with content changesLibravatar Elijah Newren1-0/+76
2010-09-29t6036: Test index and worktree state, not just that merge failsLibravatar Elijah Newren1-3/+21
2010-09-29t6020: Add a testcase for modify/delete + directory/file conflictLibravatar Elijah Newren1-0/+47
2010-09-29t6020: Modernize style a bitLibravatar Elijah Newren1-15/+20
2010-09-29t6022: Add tests for rename/rename combined with D/F conflictsLibravatar Elijah Newren1-0/+79
2010-09-29t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)Libravatar Elijah Newren1-0/+63
2010-09-29t6022: Add tests with both rename source & dest involved in D/F conflictsLibravatar Elijah Newren1-0/+38
2010-09-29t6022: Add tests for reversing order of merges when D/F conflicts presentLibravatar Elijah Newren1-0/+58
2010-09-29t6022: Add test combinations of {content conflict?, D/F conflict remains?}Libravatar Elijah Newren1-0/+128
2010-09-29t6032: Add a test checking for excessive output from mergeLibravatar Elijah Newren1-0/+30
2010-09-29merge-recursive: Restructure showing how to chain more process_* functionsLibravatar Junio C Hamano1-3/+8
2010-09-29t3030: Add a testcase for resolvable rename/add conflict with symlinksLibravatar Schalk, Ken1-1/+36
2010-09-29Merge branch 'en/rename-d-f' into en/merge-recursiveLibravatar Junio C Hamano2-8/+74
2010-09-18Git 1.7.3Libravatar Junio C Hamano3-14/+8
2010-09-18Merge branch 'js/ls-files-x-doc'Libravatar Junio C Hamano1-5/+6
2010-09-17git-rebase--interactive.sh: replace cut with ${v%% *}Libravatar Chris Johnsen1-1/+1
2010-09-17t/t7300: workaround ancient touch by rearranging argumentsLibravatar Brandon Casey1-1/+1
2010-09-16Merge branch 'bg/fix-t7003'Libravatar Junio C Hamano1-38/+41
2010-09-15ls-files documentation: reword for consistencyLibravatar Junio C Hamano1-4/+4
2010-09-15git-ls-files.txt: clarify -x/--exclude optionLibravatar Jay Soffian1-2/+3
2010-09-15Git 1.7.3 rc2Libravatar Junio C Hamano2-3/+9
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 16:42:32 +0000