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