Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t6042-merge-rename-corner-cases.sh
Age
Commit message (
Expand
)
Author
2018-11-08
merge-recursive: improve rename/rename(1to2)/add[/add] handling
Elijah Newren
2018-11-08
merge-recursive: improve handling for rename/rename(2to1) conflicts
Elijah Newren
2018-11-08
merge-recursive: fix rename/add conflict handling
Elijah Newren
2018-11-08
t6036, t6042: testcases for rename collision of already conflicting files
Elijah Newren
2018-11-08
t6042: add tests for consistency in file collision conflict handling
Elijah Newren
2018-08-17
Merge branch 'en/abort-df-conflict-fixes'
Junio C Hamano
2018-08-03
Merge branch 'en/t6042-insane-merge-rename-testcases'
Junio C Hamano
2018-07-31
read-cache: fix directory/file conflict handling in read_index_unmerged()
Elijah Newren
2018-07-17
t6000-t6999: fix broken &&-chains
Eric Sunshine
2018-07-04
t6042: add testcase covering long chains of rename conflicts
Elijah Newren
2018-07-04
t6042: add testcase covering rename/rename(2to1)/delete/delete conflict
Elijah Newren
2018-07-04
t6042: add testcase covering rename/add/delete conflict type
Elijah Newren
2018-05-28
t6036, t6042: prefer test_cmp to sequences of test
Elijah Newren
2018-05-28
t6036, t6042: prefer test_path_is_file, test_path_is_missing
Elijah Newren
2018-05-28
t6036, t6042: use test_line_count instead of wc -l
Elijah Newren
2018-05-28
t6036, t6042: use test_create_repo to keep tests independent
Elijah Newren
2012-07-27
i18n: merge-recursive: mark strings for translation
Jiang Xin
2012-04-11
tests: modernise style: more uses of test_line_count
Stefano Lattarini
2011-08-15
merge-recursive: Fix working copy handling for rename/rename/add/add
Elijah Newren
2011-08-15
merge-recursive: add handling for rename/rename/add-dest/add-dest
Elijah Newren
2011-08-15
merge-recursive: Consider modifications in rename/rename(2to1) conflicts
Elijah Newren
2011-08-15
merge-recursive: Provide more info in conflict markers with file renames
Elijah Newren
2011-08-15
merge-recursive: Improve handling of rename target vs. directory addition
Elijah Newren
2011-08-15
merge-recursive: Fix deletion of untracked file in rename/delete conflicts
Elijah Newren
2011-08-15
t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts
Elijah Newren
2011-08-15
t6042: Ensure rename/rename conflicts leave index and workdir in sane state
Elijah Newren
2011-08-15
t6042: Add tests for content issues with modify/rename/directory conflicts
Elijah Newren
2011-08-15
t6042: Add a testcase where undetected rename causes silent file deletion
Elijah Newren
2011-08-15
t6042: Add a pair of cases where undetected renames cause issues
Elijah Newren
2011-08-15
t6042: Add failing testcase for rename/modify/add-source conflict
Elijah Newren
2011-08-15
t6042: Add a testcase where git deletes an untracked file
Elijah Newren