| 2018-07-11 | merge-recursive: fix assumption that head tree being... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-11 | merge-recursive: make sure when we say we abort that... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-11 | t6044: add a testcase for index matching head, when... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-11 | t6036: add a failed conflict detection case: regular... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-06 | t6036: add lots of detail for directory/file conflicts... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-03 | t6042: add testcase covering long chains of rename... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-03 | t6042: add testcase covering rename/rename(2to1)/delete... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-03 | t6042: add testcase covering rename/add/delete conflict... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-03 | t6036: add a failed conflict detection case with conflicting... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-03 | t6036: add a failed conflict detection case with submodule... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-03 | t6036: add a failed conflict detection case with submodule... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-03 | t6036: add a failed conflict detection case with symlink... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-03 | t6036: add a failed conflict detection case with symlink... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-03 | t6044: verify that merges expected to abort actually... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-03 | index_has_changes(): avoid assuming operating on the_index Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-03 | read-cache.c: move index_has_changes() from merge.c Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-28 | t5407: fix test to cover intended arguments Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-28 | apply: fix grammar error in comment Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-27 | git-rebase--merge: modernize "git-$cmd" to "git $cmd" Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-27 | Fix use of strategy options with interactive rebases Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-27 | t3418: add testcase showing problems with rebase -i... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-27 | directory-rename-detection.txt: technical docs on abilities... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-27 | git-rebase: make --allow-empty-message the default Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-27 | git-rebase.txt: address confusion between --no-ff vs... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-27 | t3401: add directory rename testcases for rebase and am Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-27 | git-rebase: error out when incompatible options passed Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-27 | git-rebase.txt: document behavioral differences between... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-27 | t3422: new testcases for checking when incompatible... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-26 | git-rebase.sh: update help messages a bit Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-26 | git-rebase.txt: document incompatible options Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-13 | RelNotes 2.18: clarify where directory rename detection... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-12 | merge-recursive: add pointer about unduly complex looking... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-12 | merge-recursive: rename conflict_rename_*() family... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-12 | merge-recursive: clarify the rename_dir/RENAME_DIR... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-12 | merge-recursive: align labels with their respective... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-12 | merge-recursive: fix numerous argument alignment issues Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-12 | merge-recursive: fix miscellaneous grammar error in... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-06-01 | RelNotes: remove duplicate release note Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-28 | t6036: prefer test_when_finished to manual cleanup... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-28 | t6036, t6042: prefer test_cmp to sequences of test Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-28 | t6036, t6042: prefer test_path_is_file, test_path_is_missing Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-28 | t6036, t6042: use test_line_count instead of wc -l Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-28 | t6036, t6042: use test_create_repo to keep tests independent Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-25 | rev-parse: check lookup'ed commit references for NULL Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-20 | merge-recursive: provide pair of `unpack_trees_{start... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: fix check for skipability of working... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: make "Auto-merging" comment show for... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: fix remainder of was_dirty() to use... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: fix was_tracked() to quit lying with... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | t6046: testcases checking whether updates can be skipped... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: avoid triggering add_cacheinfo error... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: move more is_dirty handling to merge_content Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: improve add_cacheinfo error handling Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: avoid spurious rename/rename conflict... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | directory rename detection: new testcases showcasing... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: fix remaining directory rename + dirty... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: fix overwriting dirty files involved... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: avoid clobbering untracked files with... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: apply necessary modifications for... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: when comparing files, don't include... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: check for file level conflicts then... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: add computation of collisions due... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: check for directory level conflicts Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-08 | merge-recursive: add get_directory_renames() Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-05-02 | unpack_trees: fix breakage when o->src_index != o-... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-25 | Make running git under other debugger-like programs... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-20 | merge-recursive: make a helper function for cleanup... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-04-20 | merge-recursive: split out code for determining diff_filepairs Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 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 |