summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* submodule--helper: replace connect-gitdir-workingtree by ensure-core-worktreeStefan Beller2018-08-142-29/+42
* builtin/submodule--helper: factor out method to update a single submoduleStefan Beller2018-08-031-10/+10
* builtin/submodule--helper: store update_clone information in a structStefan Beller2018-08-031-10/+27
* builtin/submodule--helper: factor out submodule updatingStefan Beller2018-08-031-26/+33
* git-submodule.sh: rename unused variablesStefan Beller2018-08-032-5/+4
* git-submodule.sh: align error reporting for update mode to use pathStefan Beller2018-08-031-1/+1
* Fifth batch for 2.19 cycleJunio C Hamano2018-08-021-0/+107
* Merge branch 'jt/commit-graph-per-object-store'Junio C Hamano2018-08-0216-62/+207
|\
| * commit-graph: add repo arg to graph readersJonathan Tan2018-07-1713-42/+162
| * commit-graph: store graph in struct object_storeJonathan Tan2018-07-173-21/+27
| * commit-graph: add free_commit_graphJonathan Tan2018-07-173-10/+18
| * commit-graph: add missing forward declarationJonathan Tan2018-07-171-0/+2
| * object-store: add missing includeJonathan Tan2018-07-171-0/+3
| * commit-graph: refactor preparing commit graphJonathan Tan2018-07-171-11/+17
| * Merge branch 'ds/commit-graph-fsck' into jt/commit-graph-per-object-storeJunio C Hamano2018-07-1714-83/+575
| |\
* | \ 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-023-3/+57
|\ \ \ \
| * | | | tag: don't warn if target is missing but promisedJonathan Tan2018-07-162-5/+17
| * | | | revision: tolerate promised targets of tagsJonathan Tan2018-07-162-0/+42
* | | | | Merge branch 'jt/fetch-negotiator-skipping'Junio C Hamano2018-08-028-4/+461
|\ \ \ \ \
| * | | | | negotiator/skipping: skip commits during fetchJonathan Tan2018-07-168-4/+461
* | | | | | Merge branch 'jm/send-email-tls-auth-on-batch'Junio C Hamano2018-08-021-2/+1
|\ \ \ \ \ \
| * | | | | | send-email: fix tls AUTH when sending batchJules Maselbas2018-07-161-2/+1
* | | | | | | Merge branch 'bc/sequencer-export-work-tree-as-well'Junio C Hamano2018-08-022-0/+11
|\ \ \ \ \ \ \
| * | | | | | | sequencer: pass absolute GIT_WORK_TREE to exec commandsbrian m. carlson2018-07-162-0/+11
* | | | | | | | 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-029-179/+124
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: fix misleading pre-merge check documentationElijah Newren2018-07-111-3/+3
| * | | | | | | | | merge-recursive: enforce rule that index matches head before mergingElijah Newren2018-07-114-137/+18
View Lorry Controller Status