summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/maint-submodule-checkout'Junio C Hamano2009-04-071-0/+42
|\
| * Fix 'git checkout <submodule>' to update the indexJohannes Schindelin2009-04-021-0/+42
* | Merge branch 'cb/maint-merge-recursive-submodule-fix'Junio C Hamano2009-04-071-0/+74
|\ \
| * | update cache for conflicting submodule entriesClemens Buchacher2009-04-051-1/+1
| * | add tests for merging with submodulesClemens Buchacher2009-04-051-0/+74
| * | Merge branch 'js/maint-diff-temp-smudge' into maintJunio C Hamano2009-04-021-0/+16
| |\ \
| * \ \ Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maintJunio C Hamano2009-04-021-1/+1
| |\ \ \ | | |_|/ | |/| |
* | | | Merge branch 'jc/shared-literally'Junio C Hamano2009-04-061-0/+37
|\ \ \ \
| * | | | t1301: loosen test for forced modesJeff King2009-04-011-2/+2
| * | | | "core.sharedrepository = 0mode" should set, not loosenJunio C Hamano2009-03-271-0/+37
* | | | | Merge branch 'mg/tracked-local-branches'Junio C Hamano2009-04-061-1/+9
|\ \ \ \ \
| * | | | | Make local branches behave like remote branches when --trackedMichael J Gruber2009-04-011-1/+1
| * | | | | Test for local branches being followed with --trackMichael J Gruber2009-03-271-1/+9
* | | | | | Merge branch 'sb/format-patch-patchname'Junio C Hamano2009-04-0611-33/+265
|\ \ \ \ \ \
| * | | | | | format-patch: --numbered-files and --stdout aren't mutually exclusiveStephen Boyd2009-03-222-1/+171
| * | | | | | format-patch: --attach/inline uses filename instead of SHA1Stephen Boyd2009-03-2210-32/+94
* | | | | | | tests: remove exit after test_done callJeff King2009-04-0517-26/+0
* | | | | | | send-email: fix nasty bug in ask() functionJay Soffian2009-04-041-0/+13
* | | | | | | send-email: ensure quoted addresses are rfc2047 encodedJay Soffian2009-04-021-0/+13
* | | | | | | send-email: correct two tests which were going interactiveJay Soffian2009-04-021-3/+5
* | | | | | | Merge branch 'ef/fast-export'Junio C Hamano2009-04-011-0/+15
|\ \ \ \ \ \ \
| * | | | | | | builtin-fast-export.c: handle nested tagsErik Faye-Lund2009-03-291-2/+2
| * | | | | | | builtin-fast-export.c: fix crash on tagged treesErik Faye-Lund2009-03-291-3/+2
| * | | | | | | test-suite: adding a test for fast-export with tag variantsErik Faye-Lund2009-03-291-0/+16
| |/ / / / / /
* | | | | | | Merge branch 'mh/format-patch-add-header'Junio C Hamano2009-04-011-0/+15
|\ \ \ \ \ \ \
| * | | | | | | format-patch: add arbitrary email headersMichael Hendricks2009-03-271-0/+15
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jc/maint-1.6.0-keep-pack'Junio C Hamano2009-04-011-0/+61
|\ \ \ \ \ \ \
| * | | | | | | pack-objects: don't loosen objects available in alternate or kept packsBrandon Casey2009-03-211-1/+1
| * | | | | | | t7700: demonstrate repack flaw which may loosen objects unnecessarilyBrandon Casey2009-03-211-0/+17
| * | | | | | | pack-objects: only repack or loosen objects residing in "local" packsBrandon Casey2009-03-201-1/+1
| * | | | | | | git-repack.sh: don't use --kept-pack-only option to pack-objectsBrandon Casey2009-03-201-1/+1
| * | | | | | | t7700-repack: add two new tests demonstrating repacking flawsBrandon Casey2009-03-201-0/+44
* | | | | | | | send-email: ask_default should apply to all emails, not just the firstJay Soffian2009-04-011-1/+3
* | | | | | | | send-email: add tests for refactored promptingJay Soffian2009-03-291-4/+48
* | | | | | | | Merge branch 'maint'Junio C Hamano2009-03-282-9/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-282-9/+1
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | test-lib: Clean up comments and Makefile.Emil Sit2009-03-282-9/+1
| | * | | | | | Merge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1Junio C Hamano2009-03-212-19/+20
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1Junio C Hamano2009-03-211-0/+17
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-122-1/+33
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0Junio C Hamano2009-03-1221-2/+209
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'cc/maint-1.6.0-bisect-fix' into maint-1.6.0Junio C Hamano2009-03-121-0/+25
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'fg/maint-1.6.0-exclude-bq' into maint-1.6.0Junio C Hamano2009-03-121-1/+8
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0Junio C Hamano2009-03-121-0/+18
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-1.6.1-remote-remove-mirror' into maint-1.6.1Junio C Hamano2009-03-121-0/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ek/maint-1.6.1-filter-branch-bare' into maint-1.6.1Junio C Hamano2009-03-121-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1Junio C Hamano2009-03-121-1/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1Junio C Hamano2009-03-121-0/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.1-allow-uninteresting-missing' into maint-1.6.1Junio C Hamano2009-03-121-0/+37
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.1Junio C Hamano2009-03-1221-2/+209
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | |