summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ep/use-git-trace-curl-in-tests' into maintJunio C Hamano2016-09-194-9/+19
|\
| * t5551-http-fetch-smart.sh: use the GIT_TRACE_CURL environment varep/use-git-trace-curl-in-testsElia Pinto2016-09-071-3/+12
| * t5550-http-fetch-dumb.sh: use the GIT_TRACE_CURL environment varElia Pinto2016-09-071-5/+5
| * test-lib.sh: preserve GIT_TRACE_CURL from the environmentElia Pinto2016-09-071-0/+1
| * t5541-http-push-smart.sh: use the GIT_TRACE_CURL environment varElia Pinto2016-09-071-1/+1
* | Merge branch 'js/t6026-clean-up' into maintJunio C Hamano2016-09-191-0/+2
|\ \
| * | t6026-merge-attr: clean up background process at end of test casejs/t6026-clean-upJohannes Sixt2016-09-071-0/+2
| |/
* | Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maintJunio C Hamano2016-09-191-7/+14
|\ \
| * | symbolic-ref -d: do not allow removal of HEADjc/forbid-symbolic-ref-d-HEADJunio C Hamano2016-09-021-7/+14
* | | Merge branch 'jc/submodule-anchor-git-dir' into maintJunio C Hamano2016-09-191-0/+35
|\ \ \
| * | | submodule: avoid auto-discovery in prepare_submodule_repo_env()jc/submodule-anchor-git-dirJunio C Hamano2016-09-011-0/+35
| |/ /
* | | Merge branch 'jk/test-lib-drop-pid-from-results' into maintJunio C Hamano2016-09-191-2/+2
|\ \ \ | |_|/ |/| |
| * | test-lib: drop PID from test-results/*.countjk/test-lib-drop-pid-from-resultsJeff King2016-08-301-2/+2
| |/
* | Merge branch 'mh/blame-worktree'Junio C Hamano2016-08-311-0/+5
|\ \
| * | blame: fix segfault on untracked filesmh/blame-worktreeThomas Gummerer2016-08-291-0/+5
* | | Merge branch 'kw/patch-ids-optim'Junio C Hamano2016-08-311-0/+0
|\ \ \
| * | | p3400: make test script executablekw/patch-ids-optimRené Scharfe2016-08-291-0/+0
* | | | Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile'Junio C Hamano2016-08-251-0/+13
|\ \ \ \
| * | | | mingw: ensure temporary file handles are not inherited by child processesbw/mingw-avoid-inheriting-fd-to-lockfileBen Wijen2016-08-231-1/+1
| * | | | t6026-merge-attr: child processes must not inherit index.lock handlesBen Wijen2016-08-181-0/+13
| | |_|/ | |/| |
* | | | Merge branch 'ab/hooks'Junio C Hamano2016-08-191-0/+6
|\ \ \ \
| * | | | rev-parse: respect core.hooksPath in --git-pathab/hooksJohannes Schindelin2016-08-161-0/+6
* | | | | Merge branch 'jk/difftool-command-not-found'Junio C Hamano2016-08-191-0/+6
|\ \ \ \ \
| * | | | | difftool: always honor fatal error exit codesjk/difftool-command-not-foundJohn Keeping2016-08-151-0/+6
| | |/ / / | |/| | |
* | | | | Merge branch 'sb/checkout-explit-detach-no-advice'Junio C Hamano2016-08-191-0/+23
|\ \ \ \ \
| * | | | | checkout: do not mention detach advice for explicit --detach optionsb/checkout-explit-detach-no-adviceStefan Beller2016-08-151-0/+23
| |/ / / /
* | | | | Merge branch 'tb/t0027-raciness-fix'Junio C Hamano2016-08-191-3/+3
|\ \ \ \ \
| * | | | | convert: Correct NNO tests and missing `LF will be replaced by CRLF`tb/t0027-raciness-fixTorsten Bögershausen2016-08-141-3/+3
* | | | | | Merge branch 'rs/pull-signed-tag'Junio C Hamano2016-08-191-0/+18
|\ \ \ \ \ \
| * | | | | | merge-recursive: fix verbose output for multiple base treesRené Scharfe2016-08-131-0/+18
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'js/test-lint-pathname'Junio C Hamano2016-08-171-1/+10
|\ \ \ \ \ \
| * | | | | | t/Makefile: ensure that paths are valid on platforms we carejs/test-lint-pathnameJohannes Schindelin2016-08-161-1/+10
| |/ / / / /
| * | | | | Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano2016-08-121-0/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/use-strbuf-addstr' into maintJunio C Hamano2016-08-101-3/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/t4205-cleanup' into maintJunio C Hamano2016-08-101-198/+200
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nd/fbsd-lazy-mtime' into maintJunio C Hamano2016-08-101-1/+16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/t4130-rename-without-ino' into maintJunio C Hamano2016-08-101-3/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/grep-commandline-vs-configuration' into maintJunio C Hamano2016-08-101-0/+14
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maintJunio C Hamano2016-08-101-0/+11
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/status-suggest-merge-abort' into maintJunio C Hamano2016-08-102-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/submodule-config-code-cleanup' into maintJunio C Hamano2016-08-082-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-08-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/unpack-trees-advice-messages' into maintJunio C Hamano2016-08-083-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/pack-ofs-4gb-limit' into maintJunio C Hamano2016-08-081-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/ignore-space-at-eol' into maintJunio C Hamano2016-08-081-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-scrub-url' into maintJunio C Hamano2016-08-081-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/cache-tree-ita' into maintJunio C Hamano2016-08-0814-50/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/blame-worktree' into maintJunio C Hamano2016-08-081-17/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/reflog-past-root'Junio C Hamano2016-08-171-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | t1410: remove superfluous 'git reflog' from the 'walk past root' testsg/reflog-past-rootSZEDER Gábor2016-08-151-1/+0
View Lorry Controller Status