summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is htmljs/test-help-format-windows-port-fixJohannes Sixt2013-10-301-1/+1
* Merge branch 'jc/ls-files-killed-optim' into maintJunio C Hamano2013-10-231-8/+19
|\
| * dir.c::test_one_path(): work around directory_exists_in_index_icase() breakagejc/ls-files-killed-optimEric Sunshine2013-08-231-6/+9
| * t3010: update to demonstrate "ls-files -k" optimization pitfallsJunio C Hamano2013-08-151-3/+9
* | Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-10-232-4/+40
|\ \
| * | t3200: fix failure on case-insensitive filesystemsjh/checkout-auto-trackingEric Sunshine2013-09-171-0/+1
| * | branch.c: Relax unnecessary requirement on upstream's remote ref namePer Cederqvist2013-09-091-1/+1
| * | t3200: Add test demonstrating minor regression in 41c21f2Johan Herland2013-09-091-0/+34
| * | t3200: Minor fix when preparing for tracking failureJohan Herland2013-09-091-1/+2
| * | t2024: Fix &&-chaining and a couple of typosJohan Herland2013-09-091-3/+3
* | | Merge branch 'nd/fetch-into-shallow' into maintJunio C Hamano2013-10-232-3/+11
|\ \ \
| * | | Add testcase for needless objects during a shallow fetchnd/fetch-into-shallowMatthijs Kooijman2013-08-281-0/+11
| * | | upload-pack: delegate rev walking in shallow fetch to pack-objectsNguyễn Thái Ngọc Duy2013-08-281-3/+0
* | | | Merge branch 'nd/git-dir-pointing-at-gitfile' into maintJunio C Hamano2013-10-171-0/+4
|\ \ \ \
| * | | | Make setup_git_env() resolve .git file when $GIT_DIR is not specifiednd/git-dir-pointing-at-gitfileNguyễn Thái Ngọc Duy2013-09-031-0/+4
* | | | | Merge branch 'ap/commit-author-mailmap' into maintJunio C Hamano2013-10-171-0/+11
|\ \ \ \ \
| * | | | | commit: search author pattern against mailmapap/commit-author-mailmapAntoine Pelisse2013-08-241-0/+11
| | |/ / / | |/| | |
* | | | | Merge branch 'es/rebase-i-no-abbrev' into maintJunio C Hamano2013-10-171-2/+87
|\ \ \ \ \
| * | | | | rebase -i: fix short SHA-1 collisiones/rebase-i-no-abbrevJunio C Hamano2013-08-251-1/+1
| * | | | | t3404: rebase -i: demonstrate short SHA-1 collisionEric Sunshine2013-08-251-0/+24
| * | | | | t3404: make tests more self-containedEric Sunshine2013-08-251-2/+63
* | | | | | Merge branch 'rt/rebase-p-no-merge-summary' into maintJunio C Hamano2013-10-171-0/+23
|\ \ \ \ \ \
| * | | | | | rebase --preserve-merges: ignore "merge.log" configrt/rebase-p-no-merge-summaryRalf Thielow2013-08-211-0/+23
| | |/ / / / | |/| | | |
* | | | | | t4254: modernize testsSZEDER Gábor2013-10-171-21/+15
* | | | | | clone --branch: refuse to clone if upstream repo is emptyRalf Thielow2013-10-141-1/+7
* | | | | | Merge branch 'bc/completion-for-bash-3.0' into maintJunio C Hamano2013-09-181-1/+1
|\ \ \ \ \ \
| * | | | | | t9902-completion.sh: old Bash still does not support array+=('') notationBrandon Casey2013-08-211-1/+1
| |/ / / / /
* | | | | | Merge branch 'mm/no-shell-escape-in-die-message' into maintJunio C Hamano2013-09-181-0/+13
|\ \ \ \ \ \
| * | | | | | die_with_status: use "printf '%s\n'", not "echo"mm/no-shell-escape-in-die-messageMatthieu Moy2013-08-071-0/+13
* | | | | | | Merge branch 'jl/some-submodule-config-are-not-boolean' into maintJunio C Hamano2013-09-181-0/+10
|\ \ \ \ \ \ \
| * | | | | | | avoid segfault on submodule.*.path set to an empty "true"jl/some-submodule-config-are-not-booleanJharrod LaFon2013-08-191-0/+10
* | | | | | | | Merge branch 'tr/log-full-diff-keep-true-parents' into maintJunio C Hamano2013-09-182-0/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | log: use true parents for diff when walking reflogstr/log-full-diff-keep-true-parentsThomas Rast2013-08-051-0/+22
| * | | | | | | | log: use true parents for diff even when rewritingThomas Rast2013-08-011-0/+6
* | | | | | | | | Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' into maintJunio C Hamano2013-09-181-0/+72
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5802: add test for connect helperJunio C Hamano2013-08-071-0/+72
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sp/clip-read-write-to-8mb' into maintJunio C Hamano2013-09-181-0/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | xread, xwrite: limit size of IO to 8MBSteffen Prohaska2013-08-201-0/+14
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/mailmap-incomplete-line' into maintJunio C Hamano2013-09-181-1/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mailmap: handle mailmap blobs without trailing newlinesjk/mailmap-incomplete-lineJeff King2013-08-281-1/+15
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | t7406-submodule-update: add missing &&Tay Ray Chuan2013-09-171-1/+1
* | | | | | | | | Merge branch 'nd/fetch-pack-shallow-fix' into maintJunio C Hamano2013-09-051-0/+16
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | fetch-pack: do not remove .git/shallow file when --depth is not specifiednd/fetch-pack-shallow-fixNguyễn Thái Ngọc Duy2013-08-251-0/+16
| |/ / / / / / /
* | | | | | | | Revert "Add new @ shortcut for HEAD"Junio C Hamano2013-08-141-2/+0
* | | | | | | | Revert "git stash: avoid data loss when "git stash save" kills a directory"Junio C Hamano2013-08-141-18/+0
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'jk/submodule-subdirectory-ok'Junio C Hamano2013-08-091-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | t/t7407: fix two typos in submodule testsjk/submodule-subdirectory-okPhil Hord2013-08-091-1/+1
* | | | | | | Merge branch 'es/blame-L-breakage'Junio C Hamano2013-08-051-2/+2
|\ \ \ \ \ \ \
| * | | | | | | t8001, t8002: fix "blame -L :literal" test on NetBSDes/blame-L-breakageRené Scharfe2013-08-051-2/+2
* | | | | | | | Merge branch 'dn/test-reject-utf-16'Junio C Hamano2013-08-052-2/+2
|\ \ \ \ \ \ \ \