summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mk/maint-apply-swap' into maintJunio C Hamano2009-05-031-0/+66
|\
| * 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 '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 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
| |\ \ | | |/
* | | 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
|\ \ \ \
| * | | | t1301-shared-repo: fix forced modes testJohannes Sixt2009-04-121-4/+8
* | | | | 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
| |\ \ \ \ \ \
View Lorry Controller Status