summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/submodule-init'Junio C Hamano2016-05-173-6/+80
|\
| * submodule init: redirect stdout to stderrStefan Beller2016-05-031-6/+18
| * submodule--helper update-clone: abort gracefully on missing .gitmodulesStefan Beller2016-04-291-0/+8
| * submodule init: fail gracefully with a missing .gitmodules fileStefan Beller2016-04-291-0/+8
| * submodule: port resolve_relative_url from shell to CStefan Beller2016-04-161-0/+46
| * Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-initJunio C Hamano2016-04-14155-837/+3270
| |\
| * \ Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-initJunio C Hamano2016-04-141-0/+41
| |\ \
* | \ \ Merge branch 'sb/submodule-module-list-pathspec-fix'Junio C Hamano2016-05-131-1/+1
|\ \ \ \
| * | | | submodule deinit test: fix broken && chain in subshellsb/submodule-module-list-pathspec-fixStefan Beller2016-05-031-1/+1
* | | | | Merge branch 'jc/commit-tree-ignore-commit-gpgsign'Junio C Hamano2016-05-131-3/+10
|\ \ \ \ \
| * | | | | commit-tree: do not pay attention to commit.gpgsignjc/commit-tree-ignore-commit-gpgsignJunio C Hamano2016-05-031-3/+10
* | | | | | Merge branch 'sb/clean-test-fix'Junio C Hamano2016-05-101-1/+1
|\ \ \ \ \ \
| * | | | | | t7300: mark test with SANITYsb/clean-test-fixStefan Beller2016-05-031-1/+1
* | | | | | | Merge branch 'js/close-packs-before-gc'Junio C Hamano2016-05-101-0/+1
|\ \ \ \ \ \ \
| * | | | | | | t5510: run auto-gc in the foregroundjs/close-packs-before-gcSZEDER Gábor2016-05-021-0/+1
* | | | | | | | Merge branch 'ls/p4-lfs'Junio C Hamano2016-05-101-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | git-p4: fix Git LFS pointer parsingLars Schneider2016-04-281-0/+4
* | | | | | | | | Merge branch 'ls/p4-lfs-test-fix-2.7.0'Junio C Hamano2016-05-061-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t9824: fix wrong reference valuels/p4-lfs-test-fix-2.7.0Lars Schneider2016-04-291-1/+1
| * | | | | | | | | t9824: fix broken &&-chain in a subshellSZEDER Gábor2016-04-241-1/+1
* | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2016-05-061-7/+7
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'bw/rebase-merge-entire-branch'Junio C Hamano2016-05-062-2/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-rebase--merge: don't include absent parent as a basebw/rebase-merge-entire-branchBen Woosley2016-04-242-2/+11
* | | | | | | | | | | Merge branch 'js/http-custom-headers'Junio C Hamano2016-05-062-0/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | http: support sending custom HTTP headersJohannes Schindelin2016-04-272-0/+15
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sb/clone-shallow-passthru'Junio C Hamano2016-05-061-0/+85
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clone: add `--shallow-submodules` flagStefan Beller2016-04-261-0/+85
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ld/p4-test-py3'Junio C Hamano2016-05-062-6/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-p4 tests: time_in_seconds should use $PYTHON_PATHld/p4-test-py3Luke Diamand2016-04-261-1/+1
| * | | | | | | | | | | git-p4 tests: work with python3 as well as python2Luke Diamand2016-04-262-5/+6
| * | | | | | | | | | | git-p4 tests: cd to / before running pythonLuke Diamand2016-04-261-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'nf/mergetool-prompt'Junio C Hamano2016-05-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-promptNikola Forró2016-04-251-1/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sg/test-lib-simplify-expr-away'Junio C Hamano2016-05-031-5/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | test-lib: simplify '--option=value' parsingsg/test-lib-simplify-expr-awaySZEDER Gábor2016-04-221-5/+5
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'jv/merge-nothing-into-void' into maintJunio C Hamano2016-04-141-0/+10
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/commit-squash-msg' into maintJunio C Hamano2016-04-141-0/+28
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/mergetool-delete-delete-conflict' into maintJunio C Hamano2016-04-141-0/+64
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/startup-info' into maintJunio C Hamano2016-04-142-5/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/getwholeline-getdelim-empty' into maintJunio C Hamano2016-04-141-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano2016-04-141-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-parse-local-env-vars' into maintJunio C Hamano2016-04-141-0/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/config-get-urlmatch' into maintJunio C Hamano2016-04-141-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/t7502-drop-dup' into maintJunio C Hamano2016-04-141-5/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-httpd-config-nosystem' into maintJunio C Hamano2016-04-141-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/clone-t57-t56' into maintJunio C Hamano2016-04-1410-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/index-pack' into maintJunio C Hamano2016-04-141-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-index-pack-keep' into jc/index-packJunio C Hamano2016-03-031-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/name-rev-use-oldest-ref'Junio C Hamano2016-05-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | name-rev: include taggerdate in considering the best namejs/name-rev-use-oldest-refJohannes Schindelin2016-04-221-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | |