| 2017-11-15 | merge-recursive: handle addition of submodule on our... 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 |
| 2011-08-14 | merge-recursive: Remember to free generated unique... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Consolidate different update_stages... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Mark some diff_filespec struct arguments... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Correct a comment Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | merge-recursive: Make BUG message more legible by adding... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6022: Add testcase for merging a renamed file with... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6022: New tests checking for unnecessary updates of... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6022: Remove unnecessary untracked files to make test... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6036: criss-cross + rename/rename(1to2)/add-source... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6036: criss-cross w/ rename/rename(1to2)/modify+rename... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6036: tests for criss-cross merges with various directory... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6036: criss-cross with weird content can fool git... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6036: Add differently resolved modify/delete conflict... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6042: Add failing testcases for rename/rename/add... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6042: Ensure rename/rename conflicts leave index and... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6042: Add tests for content issues with modify/rename... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6042: Add a testcase where undetected rename causes... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6042: Add a pair of cases where undetected renames... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6042: Add failing testcase for rename/modify/add-source... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-08-14 | t6042: Add a testcase where git deletes an untracked... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-03-02 | merge-recursive: When we detect we can skip an update... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-03-02 | t6022: New test checking for unnecessary updates of... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-03-02 | t6022: New test checking for unnecessary updates of... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-02-03 | Add testcases showing how pathspecs are handled with... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2011-02-03 | Make rev-list --objects work together with pathspecs Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-10-06 | Introduce sane_unset and use it to ensure proper &... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-10-06 | t7800 (difftool): add missing && Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-10-06 | t7601 (merge-pull-config): add missing && Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-10-06 | t7001 (mv): add missing && Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-10-06 | t6016 (rev-list-graph-simplify-history): add missing && Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-10-06 | t5602 (clone-remote-exec): add missing && Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-10-06 | t4026 (color): remove unneeded and unchained command Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-10-06 | t4019 (diff-wserror): add lots of missing && Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-10-06 | t4202 (log): Replace '<git-command> || :' with test_might_fail Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-10-06 | t4002 (diff-basic): use test_might_fail for commands... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-10-06 | t100[12] (read-tree-m-2way, read_tree_m_u_2way): add... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-10-06 | t4017 (diff-retval): replace manual exit code check... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-10-04 | t3020 (ls-files-error-unmatch): remove stray '1' from... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Remove redundant path clearing for... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Make room for directories in D/F conflicts Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | handle_delete_modify(): Check whether D/F conflicts... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge_content(): Check whether D/F conflicts are still... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | conflict_rename_rename_1to2(): Fix checks for presence... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | conflict_rename_delete(): Check whether D/F conflicts... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Delay modify/delete conflicts if D... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Delay content merging for renames Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Delay handling of rename/delete conflicts Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Move handling of double rename of... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Move handling of double rename of... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Avoid doubly merging rename/add conflict... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Update merge_content() call signature Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Update conflict_rename_rename_1to2... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Structure process_df_entry() to handle... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Have process_entry() skip D/F or rename... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: New function to assist resolving renames... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: New data structures for deferring... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Move process_entry's content merging... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Move delete/modify handling into dedicated... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |