summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2009-04-291-0/+39
|\
| * Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-291-0/+39
| |\
| | * Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-291-0/+39
| | |\
| | | * diff -c -p: do not die on submodulesJunio C Hamano2009-04-291-0/+39
* | | | merge-recursive: do not die on a conflicting submoduleJunio C Hamano2009-04-291-3/+3
* | | | Merge branch 'maint'Junio C Hamano2009-04-281-0/+4
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-281-0/+4
| |\ \ \ | | |/ /
| | * | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-281-0/+4
| | |\ \ | | | |/
| | | * grep: fix segfault when "git grep '('" is givenLinus Torvalds2009-04-271-0/+4
| | * | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-181-0/+9
| | |\ \ | | | |/
* | | | t5701: do not get stuck in empty-push/Johannes Schindelin2009-04-271-2/+2
* | | | t4202: fix typov1.6.3-rc3Linus Torvalds2009-04-261-1/+1
* | | | t7700-repack: repack -a now works properly, expect success from testBrandon Casey2009-04-251-1/+1
* | | | t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'Brandon Casey2009-04-251-1/+1
* | | | t7800: respect NO_PERLJeff King2009-04-241-0/+5
* | | | graph API: fix a bug in the rendering of octopus mergesAllan Caffee2009-04-221-1/+1
* | | | t4202-log: extend test coverage of graphingAllan Caffee2009-04-221-2/+28
* | | | test-lib.sh: Help test_create_repo() find the templates dirMichael J Gruber2009-04-211-1/+1
* | | | Merge branch 'mk/maint-apply-swap'Junio C Hamano2009-04-211-3/+31
|\ \ \ \
| * | | | tests: make test-apply-criss-cross-rename more robustMichał Kiedrowicz2009-04-201-3/+31
| * | | | builtin-apply: keep information about files to be deletedMichał Kiedrowicz2009-04-201-1/+1
| * | | | tests: test applying criss-cross rename patchMichał Kiedrowicz2009-04-201-0/+38
| |/ / /
| * | | Merge branch 'ef/maint-fast-export' into maintJunio C Hamano2009-04-191-0/+15
| |\ \ \
| | * | | builtin-fast-export.c: handle nested tagsErik Faye-Lund2009-04-191-2/+2
| | * | | builtin-fast-export.c: fix crash on tagged treesErik Faye-Lund2009-04-191-3/+2
| | * | | test-suite: adding a test for fast-export with tag variantsErik Faye-Lund2009-04-191-0/+16
| * | | | Merge branch 'jc/maint-shared-literally' into maintJunio C Hamano2009-04-191-4/+8
| |\ \ \ \
* | | | | | clone: add test for push on an empty clone.Matthieu Moy2009-04-201-0/+10
* | | | | | Work around ash "alternate value" expansion bugBen Jackson2009-04-181-0/+10
* | | | | | Merge branch 'nd/archive-attribute'Junio C Hamano2009-04-182-4/+96
|\ \ \ \ \ \
| * | | | | | archive test: attributesRené Scharfe2009-04-171-0/+91
| * | | | | | archive tests: do not use .gitattributes in working directoryRené Scharfe2009-04-171-4/+5
* | | | | | | Merge branch 'maint'Junio C Hamano2009-04-181-0/+9
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maintJunio C Hamano2009-04-182-0/+14
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/maint-submodule-checkout' into maintJunio C Hamano2009-04-181-0/+42
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'cb/maint-merge-recursive-submodule-fix' into maintJunio C Hamano2009-04-181-0/+74
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-04-181-0/+9
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | init: Do not segfault on big GIT_TEMPLATE_DIR environment variableFrank Lichtenheld2009-04-181-0/+9
* | | | | | | | | | Merge branch 'mk/apply-swap'Junio C Hamano2009-04-171-0/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin-apply: keep information about files to be deletedMichał Kiedrowicz2009-04-151-1/+1
| * | | | | | | | | | tests: test applying criss-cross rename patchMichał Kiedrowicz2009-04-131-0/+38
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/shared-literally'Junio C Hamano2009-04-171-5/+9
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Mark t1301 permission test to depend on POSIXPERMJunio C Hamano2009-04-12132-599/+3041
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | t1301-shared-repo: fix forced modes testJohannes Sixt2009-04-121-4/+8
* | | | | | | | | | Merge branch 'ns/am-to-empty'Junio C Hamano2009-04-171-0/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-am: teach git-am to apply a patch to an unborn branchNanako Shiraishi2009-04-121-0/+15
* | | | | | | | | | | Merge branch 'bw/short-ref-strict'Junio C Hamano2009-04-171-3/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | for-each-ref: utilize core.warnAmbiguousRefs for :short-formatBert Wesarg2009-04-131-3/+15
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'da/difftool'Junio C Hamano2009-04-171-0/+211
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | difftool: add support for a difftool.prompt config variableDavid Aguilar2009-04-071-0/+64