summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ee/clean-test-fixes' into maintJunio C Hamano2015-09-031-12/+4
|\
| * t7300: fix broken && chainsee/clean-test-fixesErik Elfström2015-08-311-12/+4
* | Merge branch 'jk/log-missing-default-HEAD' into maintJunio C Hamano2015-09-031-0/+14
|\ \
| * | log: diagnose empty HEAD more clearlyjk/log-missing-default-HEADJeff King2015-08-311-0/+14
* | | Merge branch 'cc/trailers-corner-case-fix' into maintJunio C Hamano2015-09-031-1/+28
|\ \ \
| * | | trailer: support multiline titlecc/trailers-corner-case-fixChristian Couder2015-08-311-0/+14
| * | | trailer: retitle a test and correct an in-comment messageChristian Couder2015-08-261-1/+1
| * | | trailer: ignore first line of messageChristian Couder2015-08-211-1/+14
* | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-031-0/+10
|\ \ \ \
| * | | | commit: don't rewrite shared index unnecessarilydt/commit-preserve-base-index-upon-opportunistic-cache-tree-updateDavid Turner2015-08-311-0/+10
* | | | | Merge branch 'rs/archive-zip-many' into maintJunio C Hamano2015-09-031-0/+40
|\ \ \ \ \
| * | | | | archive-zip: support more than 65535 entriesrs/archive-zip-manyRené Scharfe2015-08-281-1/+1
| * | | | | t5004: test ZIP archives with many entriesRené Scharfe2015-08-281-0/+40
| * | | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2015-08-031-0/+21
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2015-08-031-0/+81
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano2015-08-031-0/+56
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2015-08-031-1/+23
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maintJunio C Hamano2015-07-271-0/+6
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rh/test-color-avoid-terminfo-in-original-home' into maintJunio C Hamano2015-07-271-52/+47
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/t0302-needs-sanity' into maintJunio C Hamano2015-07-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maintJunio C Hamano2015-07-151-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/t3020-typofix' into maintJunio C Hamano2015-09-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t3020: fix typo in test descriptionsg/t3020-typofixSZEDER Gábor2015-08-201-1/+1
* | | | | | | | | | | | | | | Merge branch 'jk/fix-alias-pager-config-key-warnings' into maintJunio C Hamano2015-09-031-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | config: silence warnings for command names with invalid keysjk/fix-alias-pager-config-key-warningsJeff King2015-08-241-0/+9
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano2015-09-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t2019: skip test requiring '*' in a file name non WindowsJohannes Sixt2015-08-111-1/+1
* | | | | | | | | | | | | | | | Merge branch 'ps/t1509-chroot-test-fixup' into maintJunio C Hamano2015-09-031-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | tests: fix cleanup after tests in t1509-root-worktreeps/t1509-chroot-test-fixupPatrick Steinhardt2015-08-051-1/+1
| * | | | | | | | | | | | | | | tests: fix broken && chains in t1509-root-worktreePatrick Steinhardt2015-08-051-4/+4
* | | | | | | | | | | | | | | | Merge branch 'jk/guess-repo-name-regression-fix' into maintJunio C Hamano2015-08-251-0/+106
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | clone: use computed length in guess_dir_namejk/guess-repo-name-regression-fixJeff King2015-08-101-6/+6
| * | | | | | | | | | | | | | | | clone: add tests for output directoryJeff King2015-08-101-0/+106
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jk/test-with-x' into maintJunio C Hamano2015-08-251-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | test-lib: disable trace when test is not verbosejk/test-with-xJeff King2015-08-071-2/+6
| * | | | | | | | | | | | | | | | test-lib: turn off "-x" tracing during chain-lint checkJeff King2015-08-071-0/+5
* | | | | | | | | | | | | | | | | Merge branch 'nd/export-worktree' into maintJunio C Hamano2015-08-191-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIRnd/export-worktreeNguyễn Thái Ngọc Duy2015-06-261-0/+17
* | | | | | | | | | | | | | | | | | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maintJunio C Hamano2015-08-191-39/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | rev-parse --parseopt: allow [*=?!] in argument hintsib/scripted-parse-opt-better-hint-stringIlya Bobyr2015-07-151-39/+60
* | | | | | | | | | | | | | | | | | | Merge branch 'as/sparse-checkout-removal' into maintJunio C Hamano2015-08-191-0/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | unpack-trees: don't update files with CE_WT_REMOVE setas/sparse-checkout-removalDavid Turner2015-07-211-0/+52
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Revert "git-am: add am.threeWay config variable"Junio C Hamano2015-07-241-19/+0
* | | | | | | | | | | | | | | | | | Merge branch 'es/worktree-add'Junio C Hamano2015-07-133-27/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | worktree: add: auto-vivify new branch when <branch> is omittedEric Sunshine2015-07-071-0/+14
| * | | | | | | | | | | | | | | | | | worktree: add: make -b/-B default to HEAD when <branch> is omittedEric Sunshine2015-07-061-0/+5
| * | | | | | | | | | | | | | | | | | tests: worktree: retrofit "checkout --to" tests for "worktree add"Eric Sunshine2015-07-063-29/+25
| * | | | | | | | | | | | | | | | | | checkout: fix bug with --to and relative HEADEric Sunshine2015-07-061-0/+10
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-07-132-11/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | worktree: new place for "git prune --worktrees"nd/multiple-work-treesNguyễn Thái Ngọc Duy2015-06-291-11/+11