summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
* | | | | | | | | | | | | | | | | | Merge branch 'js/rsync-local' into maintJunio C Hamano2009-03-211-19/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | rsync transport: allow local paths, and fix testsJohannes Schindelin2009-03-101-19/+20
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-1.6.0-read-tree-overlay' into maintJunio C Hamano2009-03-211-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | read-tree A B C: do not create a bogus index and do not segfaultJunio C Hamano2009-03-121-0/+31
* | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-send-email' into maintJunio C Hamano2009-03-111-25/+167
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | send-email: --suppress-cc improvementsJay Soffian2009-02-141-19/+131
| * | | | | | | | | | | | | | | | | | | | send-email: handle multiple Cc addresses when reading mbox messageJay Soffian2009-02-141-7/+37
* | | | | | | | | | | | | | | | | | | | | Merge branch 'fg/maint-exclude-bq' into maintJunio C Hamano2009-03-111-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | / / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Support "\" in non-wildcard exclusion entriesFinn Arne Gangstad2009-02-121-1/+8
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-071-0/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | builtin-revert.c: release index lock when cherry-picking an empty commitChris Johnsen2009-03-071-0/+33
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | t1300: use test_must_fail as appropriateJeff King2009-03-071-5/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | t3400-rebase: Move detached HEAD check earlierJohannes Sixt2009-03-011-4/+4
* | | | | | | | | | | | | | | | | git-svn: disable broken symlink workaround by defaultEric Wong2009-02-271-0/+10
* | | | | | | | | | | | | | | | | Merge branch 'cc/maint-1.6.0-bisect-fix'Junio C Hamano2009-02-271-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | bisect: fix quoting TRIED revs when "bad" commit is also "skip"pedChristian Couder2009-02-271-0/+25
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | t5540-http-push.sh: avoid non-portable grep -PJay Soffian2009-02-261-3/+8
* | | | | | | | | | | | | | | | Merge branch 'jc/maint-1.6.0-pack-directory'Junio C Hamano2009-02-251-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Make sure objects/pack exists before creating a new packJunio C Hamano2009-02-251-0/+17
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Allow HTTP tests to run on DarwinJay Soffian2009-02-252-5/+23
* | | | | | | | | | | | | | | git-svn: fix delete+add branch tracking with empty filesEric Wong2009-02-222-0/+204
* | | | | | | | | | | | | | | Introduce the function strip_path_suffix()Johannes Schindelin2009-02-191-0/+4
* | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-02-184-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | tests: fix "export var=val"Junio C Hamano2009-02-182-3/+3