summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | | | | | | | | | | Merge branch 'jd/p4-jobs-in-commit'Junio C Hamano2016-05-033-42/+150
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | git-p4: add P4 jobs to git commit messagejd/p4-jobs-in-commitJan Durovec2016-04-192-0/+108
| * | | | | | | | | | | | | | | | | | | git-p4: clean-up code style in testsJan Durovec2016-04-192-42/+42
* | | | | | | | | | | | | | | | | | | | Merge branch 'st/verify-tag'Junio C Hamano2016-04-291-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | t7030: test verifying multiple tagsSantiago Torres2016-04-181-0/+13
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/merge-refuse-new-root'Junio C Hamano2016-04-292-1/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | pull: pass --allow-unrelated-histories to "git merge"jc/merge-refuse-new-rootJunio C Hamano2016-04-211-0/+21
| * | | | | | | | | | | | | | | | | | | | t3033: avoid 'ambiguous refs' warningJunio C Hamano2016-04-211-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/push-client-deadlock-fix'Junio C Hamano2016-04-291-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | t5504: drop sigpipe=ok from push testsJeff King2016-04-201-6/+4
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/mv-submodule-fix'Junio C Hamano2016-04-291-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | mv: allow moving nested submodulessb/mv-submodule-fixStefan Beller2016-04-191-0/+16
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/test-helpers'Junio C Hamano2016-04-2937-3/+2319
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | test helpers: move test-* to t/helper/ subdirectoryNguyễn Thái Ngọc Duy2016-04-1537-3/+2319
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-path-misc-bugs'Junio C Hamano2016-04-252-5/+126
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | t7407: make expectation as clear as possiblesb/submodule-path-misc-bugsStefan Beller2016-03-301-2/+6
| * | | | | | | | | | | | | | | | | | | | | | | submodule update: test recursive path reporting from subdirectoryStefan Beller2016-03-301-0/+20