summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jt/commit-graph-per-object-store'Junio C Hamano2018-08-024-0/+119
|\
| * commit-graph: add repo arg to graph readersJonathan Tan2018-07-174-0/+119
| * Merge branch 'ds/commit-graph-fsck' into jt/commit-graph-per-object-storeJunio C Hamano2018-07-171-2/+203
| |\
* | \ Merge branch 'es/chain-lint-in-subshell'Junio C Hamano2018-08-0278-5/+1316
|\ \ \
| * | | t/chainlint.sed: drop extra spaces from regex character classEric Sunshine2018-07-311-4/+4
| * | | t/chainlint: add chainlint "specialized" test casesEric Sunshine2018-07-174-0/+31
| * | | t/chainlint: add chainlint "complex" test casesEric Sunshine2018-07-178-0/+82
| * | | t/chainlint: add chainlint "cuddled" test casesEric Sunshine2018-07-176-0/+70
| * | | t/chainlint: add chainlint "loop" and "conditional" test casesEric Sunshine2018-07-1710-0/+200
| * | | t/chainlint: add chainlint "nested subshell" test casesEric Sunshine2018-07-1712-0/+173
| * | | t/chainlint: add chainlint "one-liner" test casesEric Sunshine2018-07-176-0/+71
| * | | t/chainlint: add chainlint "whitespace" test casesEric Sunshine2018-07-1712-0/+113
| * | | t/chainlint: add chainlint "basic" test casesEric Sunshine2018-07-1716-0/+206
| * | | t/Makefile: add machinery to check correctness of chainlint.sedEric Sunshine2018-07-172-4/+22
| * | | t/test-lib: teach --chain-lint to detect broken &&-chains in subshellsEric Sunshine2018-07-172-1/+348
* | | | Merge branch 'jt/tags-to-promised-blobs-fix'Junio C Hamano2018-08-021-0/+44
|\ \ \ \
| * | | | tag: don't warn if target is missing but promisedJonathan Tan2018-07-161-2/+7
| * | | | revision: tolerate promised targets of tagsJonathan Tan2018-07-161-0/+39
* | | | | Merge branch 'jt/fetch-negotiator-skipping'Junio C Hamano2018-08-021-0/+179
|\ \ \ \ \
| * | | | | negotiator/skipping: skip commits during fetchJonathan Tan2018-07-161-0/+179
* | | | | | Merge branch 'bc/sequencer-export-work-tree-as-well'Junio C Hamano2018-08-021-0/+9
|\ \ \ \ \ \
| * | | | | | sequencer: pass absolute GIT_WORK_TREE to exec commandsbrian m. carlson2018-07-161-0/+9
* | | | | | | Merge branch 'en/t7405-recursive-submodule-conflicts'Junio C Hamano2018-08-021-0/+173
|\ \ \ \ \ \ \
| * | | | | | | t7405: verify 'merge --abort' works after submodule/path conflictsElijah Newren2018-07-111-0/+31
| * | | | | | | t7405: add a directory/submodule conflictElijah Newren2018-07-111-0/+88
| * | | | | | | t7405: add a file/submodule conflictElijah Newren2018-07-111-0/+54
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'en/t6036-merge-recursive-tests'Junio C Hamano2018-08-021-0/+451
|\ \ \ \ \ \ \
| * | | | | | | t6036: add a failed conflict detection case: regular files, different modesElijah Newren2018-07-111-0/+67
| * | | | | | | t6036: add a failed conflict detection case with conflicting typesElijah Newren2018-07-031-0/+75
| * | | | | | | t6036: add a failed conflict detection case with submodule add/addElijah Newren2018-07-031-0/+88
| * | | | | | | t6036: add a failed conflict detection case with submodule modify/modifyElijah Newren2018-07-031-0/+88
| * | | | | | | t6036: add a failed conflict detection case with symlink add/addElijah Newren2018-07-031-0/+66
| * | | | | | | t6036: add a failed conflict detection case with symlink modify/modifyElijah Newren2018-07-031-0/+67
| |/ / / / / /
* | | | | | | Merge branch 'en/dirty-merge-fixes'Junio C Hamano2018-08-023-129/+60
|\ \ \ \ \ \ \
| * | | | | | | merge-recursive: enforce rule that index matches head before mergingElijah Newren2018-07-113-130/+11
| * | | | | | | t6044: add more testcases with staged changes before a merge is invokedElijah Newren2018-07-111-0/+29
| * | | | | | | merge-recursive: fix assumption that head tree being merged is HEADElijah Newren2018-07-111-1/+1
| * | | | | | | merge-recursive: make sure when we say we abort that we actually abortElijah Newren2018-07-111-1/+1
| * | | | | | | t6044: add a testcase for index matching head, when head doesn't match HEADElijah Newren2018-07-111-0/+11
| * | | | | | | t6044: verify that merges expected to abort actually abortElijah Newren2018-07-031-11/+21
* | | | | | | | Merge branch 'js/rebase-merge-octopus'Junio C Hamano2018-08-021-0/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase --rebase-merges: add support for octopus mergesJohannes Schindelin2018-07-111-0/+34
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'tb/grep-only-matching'Junio C Hamano2018-08-021-0/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | grep.c: teach 'git grep --only-matching'Taylor Blau2018-07-091-0/+15
* | | | | | | | | Merge branch 'kg/gc-auto-windows-workaround'Junio C Hamano2018-08-021-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gc --auto: release pack files before auto packingKim Gybels2018-07-091-0/+2
* | | | | | | | | | Merge branch 'jt/fetch-nego-tip'Junio C Hamano2018-08-021-0/+78
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fetch-pack: support negotiation tip whitelistJonathan Tan2018-07-031-0/+78
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'en/t6042-insane-merge-rename-testcases'Junio C Hamano2018-08-021-0/+245
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t6042: add testcase covering long chains of rename conflictsElijah Newren2018-07-031-0/+111
View Lorry Controller Status