| 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 |
| 2010-09-30 | merge-recursive: Move rename/delete handling into dedicated... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Nuke rename/directory conflict detection Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Rename conflict_rename_rename*() for... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | merge-recursive: Small code clarification -- variable... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | t6036: Add testcase for undetected conflict Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | t6036: Add a second testcase similar to the first but... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | t6036: Test index and worktree state, not just that... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | t6020: Add a testcase for modify/delete + directory... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | t6020: Modernize style a bit Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | t6022: Add tests for rename/rename combined with D... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | t6022: Add paired rename+D/F conflict: (two/file, one... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | t6022: Add tests with both rename source & dest involved... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | t6022: Add tests for reversing order of merges when... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | t6022: Add test combinations of {content conflict?... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-30 | t6032: Add a test checking for excessive output from... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-10 | merge-recursive: D/F conflicts where was_a_dir/file... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-10 | t3509: Add rename + D/F conflict testcase that recursive... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-07 | revert: Fix trivial comment style issue Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-09-07 | cache_tree_free: Fix small memory leak Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-08-25 | tree-walk: Correct bitrotted comment about tree_entry() Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-08-20 | merge-recursive: Avoid excessive output for and reprocessing... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-08-18 | merge-recursive: Fix multiple file rename across D... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-08-18 | t6031: Add a testcase covering multiple renames across... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-08-18 | merge-recursive: Fix typo Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-08-13 | Mark tests that use symlinks as needing SYMLINKS prerequisite Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-08-13 | pull --rebase: Avoid spurious conflicts and reapplying... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-08-13 | t5520-pull: Add testcases showing spurious conflicts... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-08-02 | upload-pack: Improve error message when bad ref requested Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-07-19 | fast-export: Add a --full-tree option Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-07-19 | fast-export: Fix dropping of files with --import-marks... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-07-09 | fast-import: Improve robustness when D->F changes provided... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-07-09 | fast-export: Fix output order of D/F changes Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-07-09 | merge_recursive: Fix renames across paths below D/F... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-07-09 | merge-recursive: Fix D/F conflicts Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2010-07-09 | Add additional testcases for D/F conflicts Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2009-06-27 | fast-export: Document the fact that git-rev-list arguments... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2009-06-27 | Add new fast-export testcases Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2009-06-27 | fast-export: Add a --tag-of-filtered-object option... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2009-06-27 | fast-export: Do parent rewriting to avoid dropping... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2009-06-27 | fast-export: Make sure we show actual ref names instead... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2009-06-27 | fast-export: Omit tags that tag trees Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2009-06-27 | fast-export: Set revs.topo_order before calling setup_revisions Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2009-05-16 | gitk: Make more options easily accessible from Edit... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2009-03-26 | fast-export: Avoid dropping files from commits Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2009-03-25 | Correct missing SP characters in grammar comment at... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2009-03-25 | git-filter-branch: avoid collisions with variables... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2009-02-28 | Ensure proper setup of git_dir for git-hash-object Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2009-02-12 | fast-export: ensure we traverse commits in topological... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |