summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/reject-empty-shallow-request'Junio C Hamano2018-06-251-0/+11
|\
| * upload-pack: reject shallow requests that would return nothingNguyễn Thái Ngọc Duy2018-06-041-0/+11
* | Merge branch 'nd/complete-config-vars'Junio C Hamano2018-06-251-1/+1
|\ \
| * | am: move advice.amWorkDir parsing back to advice.cNguyễn Thái Ngọc Duy2018-05-291-1/+1
| * | Merge branch 'nd/command-list' into nd/complete-config-varsJunio C Hamano2018-05-292-21/+28
| |\ \
* | \ \ Merge branch 'en/merge-recursive-tests'Junio C Hamano2018-06-252-861/+1098
|\ \ \ \
| * | | | t6036: prefer test_when_finished to manual cleanup in following testElijah Newren2018-05-281-10/+12
| * | | | t6036, t6042: prefer test_cmp to sequences of testElijah Newren2018-05-282-73/+130
| * | | | t6036, t6042: prefer test_path_is_file, test_path_is_missingElijah Newren2018-05-282-22/+22
| * | | | t6036, t6042: use test_line_count instead of wc -lElijah Newren2018-05-282-67/+134
| * | | | t6036, t6042: use test_create_repo to keep tests independentElijah Newren2018-05-282-815/+926
| |/ / /
* | | | Merge branch 'nd/diff-apply-ita'Junio C Hamano2018-06-252-10/+64
|\ \ \ \
| * | | | apply: add --intent-to-addNguyễn Thái Ngọc Duy2018-05-291-0/+13
| * | | | t2203: add a test about "diff HEAD" caseNguyễn Thái Ngọc Duy2018-05-291-0/+17
| * | | | diff: turn --ita-invisible-in-index on by defaultNguyễn Thái Ngọc Duy2018-05-292-10/+34
| * | | | diff: ignore --ita-[in]visible-in-index when diffing worktree-to-treeNguyễn Thái Ngọc Duy2018-05-291-1/+1
* | | | | Merge branch 'ds/commit-graph-lockfile-fix'Junio C Hamano2018-06-251-0/+9
|\ \ \ \ \
| * | | | | merge: check config before loading commitsDerrick Stolee2018-05-221-0/+9
* | | | | | Merge branch 'pc/submodule-helper-foreach'Junio C Hamano2018-06-251-3/+35
|\ \ \ \ \ \
| * | | | | | submodule foreach: document variable '$displaypath'Prathamesh Chavan2018-05-091-11/+11
| * | | | | | submodule foreach: correct '$path' in nested submodules from a subdirectoryPrathamesh Chavan2018-05-091-2/+34
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'cf/submodule-progress-dissociate'Junio C Hamano2018-06-191-2/+4
|\ \ \ \ \ \
| * | | | | | t7400: encapsulate setup code in test_expect_successStefan Beller2018-06-191-2/+4
* | | | | | | Merge branch 'js/rebase-i-root-fix'Junio C Hamano2018-06-191-1/+2
|\ \ \ \ \ \ \
| * | | | | | | t3404: check root commit in 'rebase -i --root reword root commit'Todd Zullinger2018-06-191-1/+2
* | | | | | | | Merge branch 'sg/t7406-chain-fix'Junio C Hamano2018-06-181-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | t7406-submodule-update: fix broken &&-chainsSZEDER Gábor2018-06-181-6/+6
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'ks/branch-set-upstream'Junio C Hamano2018-06-181-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | t3200: clarify description of --set-upstream testKaartic Sivaraam2018-06-181-1/+1
* | | | | | | | | Merge branch 'js/rebase-i-root-fix'Junio C Hamano2018-06-181-0/+9
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | rebase --root: fix amending root commit messagesJohannes Schindelin2018-06-181-1/+1
| * | | | | | | | rebase --root: demonstrate a bug while amending root commit messagesTodd Zullinger2018-06-181-0/+9
* | | | | | | | | Merge branch 'jk/ewah-bounds-check'Junio C Hamano2018-06-181-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ewah_read_mmap: bounds-check mmap readsJeff King2018-06-181-0/+13
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Sync with Git 2.15.2Junio C Hamano2018-05-223-0/+182
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Sync with Git 2.14.4Junio C Hamano2018-05-223-0/+182
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Sync with Git 2.13.7Junio C Hamano2018-05-223-0/+182
| | | |\ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ Merge branch 'ld/git-p4-updates'Junio C Hamano2018-06-183-0/+126
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-p4: auto-size the blockLuke Diamand2018-06-121-0/+8
| * | | | | | | | | | | | git-p4: better error reporting when p4 failsLuke Diamand2018-06-121-0/+78
| * | | | | | | | | | | | git-p4: add options --commit and --disable-rebaseRomain Merland2018-06-121-0/+40
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/index-pack-maint'Junio C Hamano2018-06-132-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | index-pack: handle --strict checks of non-repo packsJeff King2018-06-011-0/+10
| * | | | | | | | | | | | prepare_commit_graft: treat non-repository as a noopJeff King2018-06-011-0/+6
* | | | | | | | | | | | | Merge branch 'jk/submodule-fsck-loose-fixup'Junio C Hamano2018-06-131-7/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fsck: avoid looking at NULL blob->objectJeff King2018-06-111-0/+18
| * | | | | | | | | | | | | t7415: don't bother creating commit for symlink testJeff King2018-06-111-7/+4
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'bc/t3430-fixup'Junio C Hamano2018-06-041-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t3430: test clean-upbrian m. carlson2018-06-041-3/+2
* | | | | | | | | | | | | | Merge branch 'jt/submodule-pull-recurse-rebase'Junio C Hamano2018-06-041-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \