aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* handle_delete_modify(): Check whether D/F conflicts are still presentElijah Newren2010-09-29
* merge_content(): Check whether D/F conflicts are still presentElijah Newren2010-09-29
* conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsElijah Newren2010-09-29
* conflict_rename_delete(): Check whether D/F conflicts are still presentElijah Newren2010-09-29
* merge-recursive: Delay content merging for renamesElijah Newren2010-09-29
* merge-recursive: Move handling of double rename of one file to twoElijah Newren2010-09-29
* merge-recursive: Avoid doubly merging rename/add conflict contentsElijah Newren2010-09-29
* t6036: Add testcase for undetected conflictElijah Newren2010-09-29
* t6036: Add a second testcase similar to the first but with content changesElijah Newren2010-09-29
* t6036: Test index and worktree state, not just that merge failsElijah Newren2010-09-29
* t6020: Add a testcase for modify/delete + directory/file conflictElijah Newren2010-09-29
* t6020: Modernize style a bitElijah Newren2010-09-29
* t6022: Add tests for rename/rename combined with D/F conflictsElijah Newren2010-09-29
* t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)Elijah Newren2010-09-29
* t6022: Add tests with both rename source & dest involved in D/F conflictsElijah Newren2010-09-29
* t6022: Add tests for reversing order of merges when D/F conflicts presentElijah Newren2010-09-29
* t6022: Add test combinations of {content conflict?, D/F conflict remains?}Elijah Newren2010-09-29
* t6032: Add a test checking for excessive output from mergeElijah Newren2010-09-29
* t3030: Add a testcase for resolvable rename/add conflict with symlinksSchalk, Ken2010-09-29
* Merge branch 'en/rename-d-f' into en/merge-recursiveJunio C Hamano2010-09-29
|\
| * merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dirElijah Newren2010-09-09
| * t3509: Add rename + D/F conflict testcase that recursive strategy failsElijah Newren2010-09-09
* | t/t7300: workaround ancient touch by rearranging argumentsBrandon Casey2010-09-17
* | Merge branch 'bg/fix-t7003'Junio C Hamano2010-09-16
|\ \
| * | t7003: Use test_commit instead of custom functionBrian Gernhardt2010-09-13
* | | Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'Junio C Hamano2010-09-15
|\ \ \
| * | | ls-tree $di $dir: do not mistakenly recurse into directoriesJunio C Hamano2010-09-12
* | | | Merge branch 'jl/fix-test'Junio C Hamano2010-09-15
|\ \ \ \
| * | | | t1020: Get rid of 'cd "$HERE"' at the start of each testJens Lehmann2010-09-09
| * | | | t2016 (checkout -p): add missing &&Jonathan Nieder2010-09-09
| * | | | t1302 (core.repositoryversion): style tweaksJonathan Nieder2010-09-09
| * | | | t2105 (gitfile): add missing &&Jonathan Nieder2010-09-09
| * | | | t1450 (fsck): remove dangling objectsJonathan Nieder2010-09-09
| * | | | tests: subshell indentation stylefixJonathan Nieder2010-09-09
| * | | | Merge branch 'jl/maint-fix-test'Junio C Hamano2010-09-06
| |\ \ \ \
| | * | | | Several tests: cd inside subshell instead of aroundJens Lehmann2010-09-06
| | |/ / /
* | | | | Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'Junio C Hamano2010-09-15
|\ \ \ \ \
| * | | | | filter-branch: retire --remap-to-ancestorCsaba Henk2010-08-27
* | | | | | Merge branch 'ch/maint-cannot-create-bundle-error'Junio C Hamano2010-09-15
|\ \ \ \ \ \
| * | | | | | bundle: detect if bundle file cannot be createdCsaba Henk2010-08-27
* | | | | | | Merge branch 'ks/recursive-rename-add-identical'Junio C Hamano2010-09-15
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | RE: [PATCH] Avoid rename/add conflict when contents are identicalSchalk, Ken2010-09-03
* | | | | | | Merge branch 'maint'Junio C Hamano2010-09-12
|\ \ \ \ \ \ \
| * | | | | | | t3101: modernise styleJunio C Hamano2010-09-12
| | |_|_|_|/ / | |/| | | | |
* | | | | | | t/t4018: avoid two unnecessary sub-shell invocationsBrandon Casey2010-09-10
* | | | | | | t/t4018: test whether the word_regex patterns compileBrandon Casey2010-09-09
* | | | | | | t/t5510-fetch.sh: improve testing with explicit URL and merge specBrandon Casey2010-09-09
* | | | | | | t/t7008: workaround broken handling of \000 by printf on IRIXBrandon Casey2010-09-09
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'jk/test-must-fail-missing'Junio C Hamano2010-09-08
|\ \ \ \ \ \
| * | | | | | tests: make test_might_fail fail on missing commandsJonathan Nieder2010-08-31
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-13 15:19:16 +0000