aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | Merge branch 'jk/rev-list-count-with-bitmap'Junio C Hamano2016-06-20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rev-list: "adjust" results of "--count --use-bitmap-index -n"Jeff King2016-06-03
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'wd/userdiff-css'Junio C Hamano2016-06-20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | userdiff: add built-in pattern for CSSWilliam Duclot2016-06-03
* | | | | | | | | | | | | Merge branch 'jg/dash-is-last-branch-in-worktree-add'Junio C Hamano2016-06-20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | worktree: allow "-" short-hand for @{-1} in add commandJordan DE GEA2016-05-31
* | | | | | | | | | | | | | Merge branch 'et/pretty-format-c-auto'Junio C Hamano2016-06-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | format_commit_message: honor `color=auto` for `%C(auto)`Edward Thomson2016-05-27
* | | | | | | | | | | | | | | Merge branch 'sb/submodule-recommend-shallowness'Junio C Hamano2016-06-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | submodule update: learn `--[no-]recommend-shallow` optionStefan Beller2016-05-27
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ah/no-verify-signature-with-pull-rebase'Junio C Hamano2016-06-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | pull: warn on --verify-signatures with --rebaseAlexander Hirsch2016-05-20
* | | | | | | | | | | | | | | | Merge branch 'ew/fast-import-unpack-limit'Junio C Hamano2016-06-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fast-import: invalidate pack_id references after looseningEric Wong2016-05-29
| * | | | | | | | | | | | | | | fast-import: implement unpack limitEric Wong2016-05-11
* | | | | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /