summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2010-09-29merge-recursive: Move handling of double rename of one file to twoLibravatar Elijah Newren1-1/+1
2010-09-29merge-recursive: Avoid doubly merging rename/add conflict contentsLibravatar Elijah Newren1-2/+2
2010-09-29t6036: Add testcase for undetected conflictLibravatar Elijah Newren1-0/+85
2010-09-29t6036: Add a second testcase similar to the first but with content changesLibravatar Elijah Newren1-0/+76
2010-09-29t6036: Test index and worktree state, not just that merge failsLibravatar Elijah Newren1-3/+21
2010-09-29t6020: Add a testcase for modify/delete + directory/file conflictLibravatar Elijah Newren1-0/+47
2010-09-29t6020: Modernize style a bitLibravatar Elijah Newren1-15/+20
2010-09-29t6022: Add tests for rename/rename combined with D/F conflictsLibravatar Elijah Newren1-0/+79
2010-09-29t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)Libravatar Elijah Newren1-0/+63
2010-09-29t6022: Add tests with both rename source & dest involved in D/F conflictsLibravatar Elijah Newren1-0/+38
2010-09-29t6022: Add tests for reversing order of merges when D/F conflicts presentLibravatar Elijah Newren1-0/+58
2010-09-29t6022: Add test combinations of {content conflict?, D/F conflict remains?}Libravatar Elijah Newren1-0/+128
2010-09-29t6032: Add a test checking for excessive output from mergeLibravatar Elijah Newren1-0/+30
2010-09-29t3030: Add a testcase for resolvable rename/add conflict with symlinksLibravatar Schalk, Ken1-1/+36
2010-09-29Merge branch 'en/rename-d-f' into en/merge-recursiveLibravatar Junio C Hamano1-0/+66
2010-09-17t/t7300: workaround ancient touch by rearranging argumentsLibravatar Brandon Casey1-1/+1
2010-09-16Merge branch 'bg/fix-t7003'Libravatar Junio C Hamano1-38/+41
2010-09-15Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'Libravatar Junio C Hamano1-0/+9
2010-09-15Merge branch 'jl/fix-test'Libravatar Junio C Hamano35-491/+604
2010-09-15Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'Libravatar Junio C Hamano1-0/+18
2010-09-15Merge branch 'ch/maint-cannot-create-bundle-error'Libravatar Junio C Hamano1-0/+7
2010-09-15Merge branch 'ks/recursive-rename-add-identical'Libravatar Junio C Hamano1-0/+35
2010-09-13t7003: Use test_commit instead of custom functionLibravatar Brian Gernhardt1-38/+41
2010-09-12Merge branch 'maint'Libravatar Junio C Hamano1-62/+64
2010-09-12ls-tree $di $dir: do not mistakenly recurse into directoriesLibravatar Junio C Hamano1-0/+9
2010-09-12t3101: modernise styleLibravatar Junio C Hamano1-62/+64
2010-09-10t/t4018: avoid two unnecessary sub-shell invocationsLibravatar Brandon Casey1-4/+4
2010-09-09t/t4018: test whether the word_regex patterns compileLibravatar Brandon Casey1-0/+5
2010-09-09t/t5510-fetch.sh: improve testing with explicit URL and merge specLibravatar Brandon Casey1-2/+28
2010-09-09t/t7008: workaround broken handling of \000 by printf on IRIXLibravatar Brandon Casey1-7/+7
2010-09-09merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dirLibravatar Elijah Newren1-2/+2
2010-09-09t3509: Add rename + D/F conflict testcase that recursive strategy failsLibravatar Elijah Newren1-0/+66
2010-09-09t1020: Get rid of 'cd "$HERE"' at the start of each testLibravatar Jens Lehmann1-41/+50
2010-09-09t2016 (checkout -p): add missing &&Libravatar Jonathan Nieder1-1/+1
2010-09-09t1302 (core.repositoryversion): style tweaksLibravatar Jonathan Nieder1-24/+40
2010-09-09t2105 (gitfile): add missing &&Libravatar Jonathan Nieder1-1/+1
2010-09-09t1450 (fsck): remove dangling objectsLibravatar Jonathan Nieder1-58/+82
2010-09-09tests: subshell indentation stylefixLibravatar Jonathan Nieder22-192/+260
2010-09-08Merge branch 'jk/test-must-fail-missing'Libravatar Junio C Hamano1-2/+21
2010-09-08Merge branch 'jh/error-removing-missing-note'Libravatar Junio C Hamano1-0/+7
2010-09-08Merge branch 'bc/maint-fetch-url-only'Libravatar Junio C Hamano1-0/+6
2010-09-08Merge branch 'jk/maint-pass-c-config-in-env'Libravatar Junio C Hamano1-0/+23
2010-09-06Merge branch 'jl/maint-fix-test'Libravatar Junio C Hamano32-260/+256
2010-09-06Several tests: cd inside subshell instead of aroundLibravatar Jens Lehmann32-260/+256
2010-09-06t3404 & t7508: cd inside subshell instead of aroundLibravatar Jens Lehmann2-4/+4
2010-09-06Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-09-06Merge branch 'xx/trivial' into maintLibravatar Junio C Hamano1-1/+1
2010-09-05t5505: add missing &&Libravatar Jens Lehmann1-1/+1
2010-09-04Merge branch 'jl/submodule-ignore-diff'Libravatar Junio C Hamano1-0/+23
2010-09-04Merge branch 'ab/test-2'Libravatar Junio C Hamano49-556/+940
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-18 21:19:07 +0000