| 2018-04-20 | merge-recursive: make !o->detect_rename codepath more... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-20 | merge-recursive: fix leaks of allocated renames and... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-20 | merge-recursive: introduce new functions to handle... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-20 | merge-recursive: move the get_renames() function Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-20 | directory rename detection: tests for handling overwriting... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-20 | directory rename detection: tests for handling overwriting... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-20 | directory rename detection: miscellaneous testcases... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-20 | directory rename detection: testcases exploring possibly... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-20 | directory rename detection: more involved edge/corner... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-20 | directory rename detection: testcases checking which... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-20 | directory rename detection: files/directories in the... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-20 | directory rename detection: partially renamed directory... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-20 | directory rename detection: testcases to avoid taking... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-20 | directory rename detection: directory splitting testcases Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-20 | directory rename detection: basic testcases Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-09 | Documentation: normalize spelling of 'normalised' Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-09 | Documentation: fix several one-character-off spelling... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-27 | merge-recursive: ensure we write updates for directory... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-27 | merge-recursive: avoid spurious rename/rename conflict... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-27 | directory rename detection: new testcases showcasing... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-27 | merge-recursive: fix remaining directory rename + dirty... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-27 | merge-recursive: fix overwriting dirty files involved... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-27 | merge-recursive: avoid clobbering untracked files with... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-27 | merge-recursive: apply necessary modifications for... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | merge-recursive: when comparing files, don't include... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | merge-recursive: check for file level conflicts then... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | merge-recursive: add computation of collisions due... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | merge-recursive: check for directory level conflicts Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | merge-recursive: add get_directory_renames() Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | merge-recursive: make a helper function for cleanup... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | merge-recursive: split out code for determining diff_filepairs Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | merge-recursive: make !o->detect_rename codepath more... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | merge-recursive: fix leaks of allocated renames and... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | merge-recursive: introduce new functions to handle... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | merge-recursive: move the get_renames() function Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | directory rename detection: tests for handling overwriting... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | directory rename detection: tests for handling overwriting... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | directory rename detection: miscellaneous testcases... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | directory rename detection: testcases exploring possibly... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | directory rename detection: more involved edge/corner... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | directory rename detection: testcases checking which... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | directory rename detection: files/directories in the... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | directory rename detection: partially renamed directory... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | directory rename detection: testcases to avoid taking... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | directory rename detection: directory splitting testcases Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-02-14 | directory rename detection: basic testcases Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-01-19 | merge-recursive: add explanation for src_entry and... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-01-19 | merge-recursive: fix logic ordering issue Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-01-19 | Tighten and correct a few testcases for merging and... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2017-12-22 | merge-recursive: avoid incorporating uncommitted changes... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2017-12-22 | move index_has_changes() from builtin/am.c to merge... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2017-12-22 | t6044: recursive can silently incorporate dirty changes... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2017-12-05 | strbuf: remove unused stripspace function alias Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2017-11-27 | merge-recursive: ignore_case shouldn't reject intentional... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2017-11-15 | sequencer: show rename progress during cherry picks Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2017-11-15 | diff: remove silent clamp of renameLimit Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2017-11-15 | progress: fix progress meters when dealing with lots... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2017-11-15 | merge-recursive: handle addition of submodule on our... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2017-11-14 | sequencer: warn when internal merge may be suboptimal... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2016-04-13 | t6044: new merge testcases for when index doesn't match... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2016-04-13 | merge-octopus: abort if index does not match HEAD Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2016-04-13 | builtin/merge.c: fix a bug with trivial merges Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2016-04-13 | t7605: add a testcase demonstrating a bug with trivial... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2016-04-13 | merge-recursive: do not check working copy when creating... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2016-04-13 | merge-recursive: remove duplicate code Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Don't re-sort a list whose order we... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Fix virtual merge base for rename... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6036: criss-cross + rename/rename(1to2)/add-dest ... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Avoid unnecessary file rewrites Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6022: Additional tests checking for unnecessary updates... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Fix spurious 'refusing to lose untracked... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6022: Add testcase for spurious "refusing to lose... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Fix working copy handling for rename... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: add handling for rename/rename/add... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Have conflict_rename_delete reuse... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Make modify/delete handling code reusable Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Consider modifications in rename/rename... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Create function for merging with branchname... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Record more data needed for merging... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Defer rename/rename(2to1) handling... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Small cleanups for conflict_rename_rename_1to2 Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Fix rename/rename(1to2) resolution... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Introduce a merge_file convenience... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Fix modify/delete resolution in the... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: When we detect we can skip an update... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Provide more info in conflict markers... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Cleanup and consolidation of rename_conflic... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Consolidate process_entry() and process_df_... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Improve handling of rename target... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Add comments about handling rename... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Make dead code for rename/rename(2to1... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Fix deletion of untracked file in... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Split update_stages_and_entry; only... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Allow make_room_for_path() to remove... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Split was_tracked() out of would_lose_untra... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Save D/F conflict filenames instead... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Fix code checking for D/F conflicts... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Fix sorting order and directory change... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Fix recursive case with D/F conflict... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Avoid working directory changes during... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |