summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* pull, fetch: add --set-upstream optionCorentin BOMPARD2019-08-191-0/+178
* Merge branch 'bc/hash-independent-tests-part-4'Junio C Hamano2019-08-092-9/+8
|\
| * t0000: reword comments for "local" testJeff King2019-08-081-8/+6
| * t: decrease nesting in test_oid_to_pathJonathan Nieder2019-08-081-1/+2
* | Merge branch 'mt/dir-iterator-updates'Junio C Hamano2019-08-091-3/+1
|\ \
| * | test-dir-iterator: use path argument directlyRené Scharfe2019-08-071-3/+1
* | | Merge branch 'en/disable-dir-rename-in-recursive-merge'Junio C Hamano2019-08-081-0/+111
|\ \ \
| * | | merge-recursive: avoid directory rename detection in recursive caseElijah Newren2019-08-061-0/+111
| * | | Merge branch 'fc/fetch-with-import-fix' into maintJunio C Hamano2019-07-292-13/+27
| |\ \ \
| * \ \ \ Merge branch 'ds/close-object-store' into maintJunio C Hamano2019-07-291-0/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'pw/add-p-recount' into maintJunio C Hamano2019-07-291-0/+8
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/trailers-use-config' into maintJunio C Hamano2019-07-291-27/+44
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tg/stash-ref-by-index-fix' into maintJunio C Hamano2019-07-291-0/+18
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'pw/rebase-abort-clean-rewritten' into maintJunio C Hamano2019-07-291-1/+17
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sg/rebase-progress' into maintJunio C Hamano2019-07-293-75/+55
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ms/submodule-foreach-fix' into maintJunio C Hamano2019-07-291-0/+7
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maintJunio C Hamano2019-07-291-0/+8
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/denoise-rm-to-resolve' into maintJunio C Hamano2019-07-291-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/mingw-spawn-with-spaces-in-path' into maintJunio C Hamano2019-07-291-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/clean-report-too-long-a-path' into maintJunio C Hamano2019-07-291-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'es/local-atomic-push-failure-with-http' into maintJunio C Hamano2019-07-291-0/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/t3404-typofix' into maintJunio C Hamano2019-07-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/t0001-case-insensitive' into maintJunio C Hamano2019-07-292-14/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/t5551-fetch-smart-error-is-translated' into maintJunio C Hamano2019-07-291-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/t5551-test-chunked' into maintJunio C Hamano2019-07-291-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sw/git-p4-unshelve-branched-files' into maintJunio C Hamano2019-07-251-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/partial-clone-missing-ref-delta-base' into maintJunio C Hamano2019-07-251-13/+99
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'xl/record-partial-clone-origin' into maintJunio C Hamano2019-07-251-3/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/request-pull-verify-remote-ref' into maintJunio C Hamano2019-07-251-0/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vv/merge-squash-with-explicit-commit' into maintJunio C Hamano2019-07-251-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/bundle-verify-require-object-store' into maintJunio C Hamano2019-07-251-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/am-i-resolved-fix' into maintJunio C Hamano2019-07-251-0/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/HEAD-symref-in-xfer-namespaces' into maintJunio C Hamano2019-07-251-0/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/server-info-remove-crufts' into maintJunio C Hamano2019-07-251-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/corrupt-worktrees' into maintJunio C Hamano2019-07-251-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/init-relative-template-fix' into maintJunio C Hamano2019-07-252-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit-graph: fix bug around octopus mergesDerrick Stolee2019-08-051-1/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/log-mailmap-flip-defaults'Junio C Hamano2019-08-022-2/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log: really flip the --mailmap defaultJunio C Hamano2019-08-021-0/+33
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log: flip the --mailmap default unconditionallyJunio C Hamano2019-08-011-2/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/early-config-with-onbranch'Junio C Hamano2019-08-021-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config: work around bug with includeif:onbranch and early configJohannes Schindelin2019-08-011-0/+5
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/repack-silence-auto-bitmap-warning'Junio C Hamano2019-08-011-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | repack: simplify handling of auto-bitmaps and .keep filesJeff King2019-07-311-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | repack: silence warnings when auto-enabled bitmaps cannot be builtJeff King2019-07-311-0/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7700: clean up .keep file in bitmap-writing testJeff King2019-07-311-0/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/sort-iter-test-output'Junio C Hamano2019-08-012-33/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t: sort output of hashmap iterationJeff King2019-07-312-33/+55
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/dir-iterator-test-fix'Junio C Hamano2019-08-012-3/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-dir-iterator: do not assume errno valuesJunio C Hamano2019-07-302-3/+12
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |