summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Sync with v2.5.4Junio C Hamano2015-09-288-0/+248
|\
| * Sync with 2.4.10Junio C Hamano2015-09-288-0/+248
| |\
| | * Sync with 2.3.10Junio C Hamano2015-09-288-0/+248
| | |\
| | | * http: limit redirection depthBlake Burkhart2015-09-252-0/+7
| | | * http: limit redirection to protocol-whitelistBlake Burkhart2015-09-252-0/+10
| | | * submodule: allow only certain protocols for submodule fetchesJeff King2015-09-231-0/+43
| | | * transport: add a protocol-whitelist environment variableJeff King2015-09-236-0/+188
| * | | Merge branch 'dt/untracked-subdir' into maintJunio C Hamano2015-09-171-0/+215
| |\ \ \
| * \ \ \ Merge branch 'ee/clean-test-fixes' into maintJunio C Hamano2015-09-031-12/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/log-missing-default-HEAD' into maintJunio C Hamano2015-09-031-0/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cc/trailers-corner-case-fix' into maintJunio C Hamano2015-09-031-1/+28
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-031-0/+10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/archive-zip-many' into maintJunio C Hamano2015-09-031-0/+40
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sg/t3020-typofix' into maintJunio C Hamano2015-09-031-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/fix-alias-pager-config-key-warnings' into maintJunio C Hamano2015-09-031-0/+9
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano2015-09-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/t1509-chroot-test-fixup' into maintJunio C Hamano2015-09-031-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mp/t7060-diff-index-test'Junio C Hamano2015-09-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t7060: actually test "git diff-index --cached -M"mp/t7060-diff-index-testMatthieu Prat2015-09-021-1/+1
* | | | | | | | | | | | | | | Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano2015-09-081-0/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | am: match --signoff to the original scripted versionjc/builtin-am-signoff-regression-fixJunio C Hamano2015-09-061-0/+48
* | | | | | | | | | | | | | | | Merge branch 'jk/am-rerere-lock-fix'Junio C Hamano2015-09-031-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fixJeff King2015-09-011-0/+36
* | | | | | | | | | | | | | | | | Merge branch 'cc/trailers-corner-case-fix'Junio C Hamano2015-09-021-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | trailer: support multiline titlecc/trailers-corner-case-fixChristian Couder2015-08-311-0/+14
* | | | | | | | | | | | | | | | | Merge branch 'ee/clean-test-fixes'Junio C Hamano2015-09-021-12/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | t7300: fix broken && chainsee/clean-test-fixesErik Elfström2015-08-311-12/+4
* | | | | | | | | | | | | | | | | Merge branch 'jk/log-missing-default-HEAD'Junio C Hamano2015-09-021-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | log: diagnose empty HEAD more clearlyjk/log-missing-default-HEADJeff King2015-08-311-0/+14
* | | | | | | | | | | | | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-011-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | commit: don't rewrite shared index unnecessarilydt/commit-preserve-base-index-upon-opportunistic-cache-tree-updateDavid Turner2015-08-311-0/+10
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'jk/guess-repo-name-regression-fix' into maintJunio C Hamano2015-08-251-0/+106
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-with-x' into maintJunio C Hamano2015-08-251-2/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/export-worktree' into maintJunio C Hamano2015-08-191-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ib/scripted-parse-opt-better-hint-string' into maintJunio C Hamano2015-08-191-39/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'as/sparse-checkout-removal' into maintJunio C Hamano2015-08-191-0/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/archive-zip-many'Junio C Hamano2015-09-011-0/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | archive-zip: support more than 65535 entriesrs/archive-zip-manyRené Scharfe2015-08-281-1/+1
| * | | | | | | | | | | | | | | | | | | | t5004: test ZIP archives with many entriesRené Scharfe2015-08-281-0/+40
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2015-08-031-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2015-08-031-0/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano2015-08-031-0/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2015-08-031-1/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/p4-fold-case-client-specs'Junio C Hamano2015-09-011-0/+200
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | git-p4: honor core.ignorecase when using P4 client specsls/p4-fold-case-client-specsLars Schneider2015-08-281-0/+200
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/describe-contains'Junio C Hamano2015-08-311-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | describe --contains: default to HEAD when no commit-ish is givensg/describe-containsSZEDER Gábor2015-08-251-0/+8
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/notes-merge-config'Junio C Hamano2015-08-312-0/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-configJacob Keller2015-08-171-0/+39
| * | | | | | | | | | | | | | | | | | | | | | | | | notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-171-0/+40
View Lorry Controller Status