summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Remove filename from conflict markersMartin Renold2009-07-012-7/+6
* Merge branch 'cc/bisect'Junio C Hamano2009-07-011-2/+2
|\
| * bisect: use a PRNG with a bias when skipping away from untestable commitsChristian Couder2009-06-131-2/+2
* | Merge branch 'sb/quiet-porcelains'Junio C Hamano2009-07-013-6/+62
|\ \
| * | stash: teach quiet optionStephen Boyd2009-06-181-0/+23
| * | am, rebase: teach quiet optionStephen Boyd2009-06-182-6/+31
| * | t4150: test applying with a newline in subjectStephen Boyd2009-06-181-0/+8
* | | Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'Junio C Hamano2009-07-011-0/+53
|\ \ \
| * | | diff-tree -r -t: include added/removed directories in the outputNick Edelen2009-06-131-0/+53
* | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2009-06-273-0/+207
|\ \ \ \
| * | | | git svn: cleanup t9138-multiple-branchesMarc Branchaud2009-06-271-57/+66
| * | | | t9138: remove stray dot in test which broke bashEric Wong2009-06-261-1/+0
| * | | | git svn: Support multiple branch and tag paths in the svn repository.Marc Branchaud2009-06-251-0/+114
| * | | | Add 'git svn reset' to unwind 'git svn fetch'Ben Jackson2009-06-251-0/+66
| * | | | git-svn: let 'dcommit $rev' work on $rev instead of HEADThomas Rast2009-06-251-0/+19
* | | | | Merge branch 'pb/send-email-cccmd-fix'Junio C Hamano2009-06-271-1/+4
|\ \ \ \ \
| * | | | | t/t9001-send-email.sh: ensure generated script is executed with $SHELL_PATHBrandon Casey2009-06-231-1/+4
* | | | | | Merge branch 'maint'Junio C Hamano2009-06-272-0/+34
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Test grep --and/--or/--notThomas Rast2009-06-271-0/+30
| * | | | | Test git archive --remoteThomas Rast2009-06-271-0/+4
* | | | | | Merge branch 'maint'Junio C Hamano2009-06-221-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | t3700-add: add a POSIXPERM prerequisite to a new testJohannes Sixt2009-06-221-1/+1
| * | | | | Merge branch 'sb/maint-1.6.0-add-config-fix' into maintJunio C Hamano2009-06-221-0/+13
| |\ \ \ \ \
* | \ \ \ \ \ Sync with 1.6.3.3Junio C Hamano2009-06-211-5/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'cb/maint-no-double-merge' into maintJunio C Hamano2009-06-211-0/+3
| |\ \ \ \ \ \
| * | | | | | | t3505: fix abuse of test_expect_codeJunio C Hamano2009-06-211-5/+5
* | | | | | | | Merge branch 'ph/submodule-rebase'Junio C Hamano2009-06-201-1/+59
|\ \ \ \ \ \ \ \
| * | | | | | | | git-submodule: add support for --merge.Johan Herland2009-06-031-1/+59
* | | | | | | | | Merge branch 'jc/cache-tree'Junio C Hamano2009-06-201-37/+37
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Avoid "diff-index --cached" optimization under --find-copies-harderJunio C Hamano2009-05-251-0/+5
| * | | | | | | | | t4007: modernize the styleJunio C Hamano2009-05-251-37/+32
* | | | | | | | | | Merge branch 'mg/pushurl'Junio C Hamano2009-06-202-3/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin-remote: Show push urls as wellMichael J Gruber2009-06-131-3/+7
| * | | | | | | | | | t5516: Check pushurl config settingMichael J Gruber2009-06-091-0/+13
* | | | | | | | | | | Merge branch 'sb/pull-rebase'Junio C Hamano2009-06-201-0/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | parse-remote: support default reflist in get_remote_merge_branchSanti Béjar2009-06-111-0/+14
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'pb/send-email-cccmd-fix'Junio C Hamano2009-06-201-5/+75
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | Test cccmd in t9001-send-email.sh and fix some bugsPaolo Bonzini2009-06-181-5/+75
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sb/maint-1.6.0-add-config-fix'Junio C Hamano2009-06-201-0/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | add: allow configurations to be overriden by command lineStephen Boyd2009-06-181-0/+13
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'mh/fix-send-email-threaded'Junio C Hamano2009-06-131-0/+21
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mh/maint-fix-send-email-threaded' into mh/fix-send-email-threadedJunio C Hamano2009-06-121-0/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | send-email: fix non-threaded mailsMarkus Heidelberg2009-06-121-1/+1
| | * | | | | | | | add a test for git-send-email for non-threaded mailsMarkus Heidelberg2009-06-121-0/+10
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | send-email: fix threaded mails without chain-reply-toMarkus Heidelberg2009-06-121-1/+1
| * | | | | | | | add a test for git-send-email for threaded mails without chain-reply-toMarkus Heidelberg2009-06-121-0/+11
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rc/http-push'Junio C Hamano2009-06-132-0/+44
|\ \ \ \ \ \ \ \
| * | | | | | | | t5550-http-fetch: test fetching of packed objectsTay Ray Chuan2009-06-061-0/+8
| * | | | | | | | http-push: send out fetch requests on queueTay Ray Chuan2009-06-061-2/+2
| * | | | | | | | t5540-http-push: test fetching of packed objectsTay Ray Chuan2009-06-061-0/+20
View Lorry Controller Status