tokkee.org

Code

projects / git.git / history

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

[git.git] / t / t6042-merge-rename-corner-cases.sh

2011-09-02	Junio C Hamano	Merge branch 'mg/maint-notes-C-doc'	blob \| commitdiff \| raw
2011-09-02	Junio C Hamano	Merge branch 'fg/submodule-ff-check-before-push'	blob \| commitdiff \| raw
2011-09-02	Junio C Hamano	Merge branch 'rc/diff-cleanup-records'	blob \| commitdiff \| raw
2011-09-02	Junio C Hamano	Merge branch 'fk/use-kwset-pickaxe-grep-f'	blob \| commitdiff \| raw
2011-09-02	Junio C Hamano	Merge branch 'en/merge-recursive-2'	blob \| commitdiff \| raw
2011-08-14	Elijah Newren	merge-recursive: Fix working copy handling for rename...	blob \| commitdiff \| raw
2011-08-14	Elijah Newren	merge-recursive: add handling for rename/rename/add...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Consider modifications in rename/renam...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Provide more info in conflict markers...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Improve handling of rename target...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	merge-recursive: Fix deletion of untracked file in...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	t6042: Add failing testcases for rename/rename/add...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	t6042: Ensure rename/rename conflicts leave index and...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	t6042: Add tests for content issues with modify/rename...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	t6042: Add a testcase where undetected rename causes...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	t6042: Add a pair of cases where undetected renames...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	t6042: Add failing testcase for rename/modify/add-sourc...	blob \| commitdiff \| raw \| diff to current
2011-08-14	Elijah Newren	t6042: Add a testcase where git deletes an untracked...	blob \| commitdiff \| raw \| diff to current

Git - the stupid content tracker