summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maintJunio C Hamano2009-04-182-0/+14
|\
| * match_tree_entry(): a pathspec only matches at directory boundariesJunio C Hamano2009-04-011-0/+6
| * tree_entry_interesting: a pathspec only matches at directory boundaryBjörn Steinbrink2009-04-011-0/+8
* | Merge branch 'js/maint-submodule-checkout' into maintJunio C Hamano2009-04-181-0/+42
|\ \
| * | Fix 'git checkout <submodule>' to update the indexJohannes Schindelin2009-04-021-0/+42
* | | Merge branch 'cb/maint-merge-recursive-submodule-fix' into maintJunio C Hamano2009-04-181-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 '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 'maint-1.6.1' into maintJunio C Hamano2009-04-171-1/+8
|\ \ \ \ \
| * \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-171-1/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix buffer overflow in config parserThomas Jarosch2009-04-171-1/+8
| | | |_|/ | | |/| |
| * | | | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1Junio C Hamano2009-04-081-1/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'jc/shared-literally' into maintJunio C Hamano2009-04-081-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 'jc/maint-1.6.0-diff-borrow-carefully' into maintJunio C Hamano2009-04-081-0/+8
|\ \ \ \ \ \ \
| * | | | | | | diff --cached: do not borrow from a work tree when a path is marked as assume...Junio C Hamano2009-03-221-0/+8
* | | | | | | | Merge branch 'jc/maint-1.6.0-keep-pack' into maintJunio C Hamano2009-04-081-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
* | | | | | | | | Change double quotes to single quotes in messageJari Aalto2009-04-071-1/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge branch 'js/maint-diff-temp-smudge' into maintJunio C Hamano2009-04-021-0/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Smudge the files fed to external diff and textconvJohannes Schindelin2009-03-221-0/+16
* | | | | | | | | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maintJunio C Hamano2009-04-021-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | git-branch: display "was sha1" on branch deletion rather than just "sha1"Brandon Casey2009-03-211-1/+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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-1.6.0-send-email-irt' into maintJunio C Hamano2009-03-211-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | send-email: test --no-thread --in-reply-to combinationThomas Rast2009-03-111-0/+11
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'mg/maint-submodule-normalize-path' into maintJunio C Hamano2009-03-211-0/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | git submodule: Fix adding of submodules at paths with ./, .. and //Michael J Gruber2009-03-031-4/+4
| * | | | | | | | | | | | | | | | | | git submodule: Add test cases for git submodule addMichael J Gruber2009-03-031-0/+49
View Lorry Controller Status