aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'jk/shell-portability'Junio C Hamano2016-06-10
|\
| * t5500 & t7403: lose bash-ism "local"Junio C Hamano2016-06-01
| * test-lib: add in-shell "env" replacementJeff King2016-06-01
* | Merge branch 'jc/t2300-setup'Junio C Hamano2016-06-10
|\ \
| * | t2300: run git-sh-setup in an environment that better mimics the real lifeJunio C Hamano2016-06-01
| |/
| * Merge branch 'sb/submodule-deinit-all' into maintJunio C Hamano2016-05-31
| |\
| * \ Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maintJunio C Hamano2016-05-31
| |\ \
| * \ \ Merge branch 'js/name-rev-use-oldest-ref' into maintJunio C Hamano2016-05-31
| |\ \ \
| * \ \ \ Merge branch 'jc/fsck-nul-in-commit' into maintJunio C Hamano2016-05-26
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/windows-dotgit' into maintJunio C Hamano2016-05-26
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'lp/typofixes' into maintJunio C Hamano2016-05-26
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sb/z-is-gnutar-ism' into maintJunio C Hamano2016-05-26
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'va/i18n-misc-updates' into maintJunio C Hamano2016-05-26
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ak/t4151-ls-files-could-be-empty' into maintJunio C Hamano2016-05-26
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/test-seq' into maintJunio C Hamano2016-05-26
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/t5601-sed-fix' into maintJunio C Hamano2016-05-26
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/clean-test-fix' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/test-lib-simplify-expr-away' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/close-packs-before-gc' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/p4-lfs' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nf/mergetool-prompt' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-client-deadlock-fix' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/mv-submodule-fix' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ld/p4-test-py3' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/perf-rebase-i'Junio C Hamano2016-06-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | perf: make the tests work without a worktreeRené Scharfe2016-05-31
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/t1500-modernize'Junio C Hamano2016-05-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | t1500: avoid setting environment variables outside of testsEric Sunshine2016-05-18
| * | | | | | | | | | | | | | | | | | | | | | | t1500: avoid setting configuration options outside of testsEric Sunshine2016-05-18
| * | | | | | | | | | | | | | | | | | | | | | | t1500: avoid changing working directory outside of testsEric Sunshine2016-05-18
| * | | | | | | | | | | | | | | | | | | | | | | t1500: test_rev_parse: facilitate future test enhancementsEric Sunshine2016-05-18
| * | | | | | | | | | | | | | | | | | | | | | | t1500: be considerate to future potential testsEric Sunshine2016-05-17
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fc/fast-import-broken-marks-file'Junio C Hamano2016-05-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | fast-import: do not truncate exported marks fileFelipe Contreras2016-05-17
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ak/t0008-ksh88-workaround'Junio C Hamano2016-05-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | t0008: 4 tests fail with ksh88Armin Kunaschik2016-05-20
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/t6044-use-test-seq'Junio C Hamano2016-05-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | t6044: replace seq by test_seqJohannes Sixt2016-05-18
* | | | | | | | | | | | | | | | | | | | | | | | | t4204: do not let $name variable clobberedJunio C Hamano2016-05-24
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool'Junio C Hamano2016-05-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | difftool: handle unmerged files in dir-diff modeDavid Aguilar2016-05-16
| | |_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-path-misc-bugs' into maintJunio C Hamano2016-05-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/use-write-script-more' into maintJunio C Hamano2016-05-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ad/commit-have-m-option' into maintJunio C Hamano2016-05-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-helper-clone-regression-fix' into maintJunio C Hamano2016-05-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/branch-shortening-funny-symrefs' into maintJunio C Hamano2016-05-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ky/branch-m-worktree' into maintJunio C Hamano2016-05-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ky/branch-d-worktree' into maintJunio C Hamano2016-05-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maintJunio C Hamano2016-04-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \