summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fast-export: Make sure we show actual ref names instead of "(null)"Elijah Newren2009-06-271-4/+1
* fast-export: Omit tags that tag treesElijah Newren2009-06-272-1/+22
* fast-export: Set revs.topo_order before calling setup_revisionsElijah Newren2009-06-271-1/+1
* 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-222-2/+15
| |\
* | \ Sync with 1.6.3.3Junio C Hamano2009-06-215-12/+53
|\ \ \ | |/ /
| * | GIT 1.6.3.3v1.6.3.3Junio C Hamano2009-06-213-2/+40
| * | Merge branch 'ak/maint-for-each-ref-no-lookup' into maintJunio C Hamano2009-06-211-9/+17
| |\ \
| * \ \ Merge branch 'rc/maint-http-local-slot-fix' into maintJunio C Hamano2009-06-212-0/+12
| |\ \ \
| * \ \ \ Merge branch 'cb/maint-no-double-merge' into maintJunio C Hamano2009-06-212-1/+7
| |\ \ \ \
| * \ \ \ \ Merge branch 'mn/maint-iconv-autoconf' into maintJunio C Hamano2009-06-211-0/+8
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'lt/maint-unsigned-left-shift' into maintJunio C Hamano2009-06-218-16/+12
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'pb/maint-1.6.2-userdiff-fix' into maintJunio C Hamano2009-06-212-7/+10
| |\ \ \ \ \ \ \
| * | | | | | | | attribute: whitespace set to true detects all errors known to gitJunio C Hamano2009-06-211-5/+7
| * | | | | | | | .gitattributes: CR at the end of the line is an errorNanako Shiraishi2009-06-211-1/+1
| * | | | | | | | t3505: fix abuse of test_expect_codeJunio C Hamano2009-06-211-5/+5
* | | | | | | | | Merge branch 'maint'Junio C Hamano2009-06-202-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'maint-1.6.2' into maintJunio C Hamano2009-06-203-7/+7
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-06-203-7/+7
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-06-203-7/+7
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | git-show-ref.txt: remove word and make consistentStephen Boyd2009-06-201-2/+2
| | | | * | | | | | | | git-svn documentation: fix typo in 'rebase vs. pull/merge' sectionMiklos Vajna2009-06-201-1/+1
* | | | | | | | | | | | Fix various sparse warnings in the git source codeLinus Torvalds2009-06-2023-42/+42
* | | | | | | | | | | | Merge branch 'ph/submodule-rebase'Junio C Hamano2009-06-204-6/+86
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-submodule: add support for --merge.Johan Herland2009-06-034-6/+86
* | | | | | | | | | | | | Merge branch 'jc/cache-tree'Junio C Hamano2009-06-207-44/+117
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Avoid "diff-index --cached" optimization under --find-copies-harderJunio C Hamano2009-05-252-2/+8
| * | | | | | | | | | | | | Optimize "diff-index --cached" using cache-treeJunio C Hamano2009-05-255-0/+55
| * | | | | | | | | | | | | t4007: modernize the styleJunio C Hamano2009-05-251-37/+32
| * | | | | | | | | | | | | cache-tree.c::cache_tree_find(): simplify internal APIJunio C Hamano2009-05-251-0/+2
| * | | | | | | | | | | | | write-tree --ignore-cache-treeJunio C Hamano2009-05-203-7/+22
* | | | | | | | | | | | | | Merge branch 'mg/pushurl'Junio C Hamano2009-06-209-17/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | avoid NULL dereference on failed mallocJim Meyering2009-06-141-2/+2
| * | | | | | | | | | | | | | builtin-remote: Make "remote -v" display push urlsMichael J Gruber2009-06-131-5/+26
| * | | | | | | | | | | | | | builtin-remote: Show push urls as wellMichael J Gruber2009-06-132-8/+22
| * | | | | | | | | | | | | | technical/api-remote: Describe new struct remote member pushurlMichael J Gruber2009-06-091-0/+4
| * | | | | | | | | | | | | | t5516: Check pushurl config settingMichael J Gruber2009-06-091-0/+13
| * | | | | | | | | | | | | | Allow push and fetch urls to be differentMichael J Gruber2009-06-095-4/+37
* | | | | | | | | | | | | | | Merge branch 'mn/maint-iconv-autoconf'Junio C Hamano2009-06-201-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | fix handling of iconv configuration optionsMarco Nelissen2009-06-081-0/+8
* | | | | | | | | | | | | | | Merge branch 'sb/pull-rebase'Junio C Hamano2009-06-204-221/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | parse-remote: remove unused functionsSanti Béjar2009-06-112-224/+0
| * | | | | | | | | | | | | | | parse-remote: support default reflist in get_remote_merge_branchSanti Béjar2009-06-112-1/+21
| * | | | | | | | | | | | | | | parse-remote: function to get the tracking branch to be mergeSanti Béjar2009-06-112-5/+31
* | | | | | | | | | | | | | | | Merge branch 'pb/send-email-cccmd-fix'Junio C Hamano2009-06-204-10/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Test cccmd in t9001-send-email.sh and fix some bugsPaolo Bonzini2009-06-184-10/+80
* | | | | | | | | | | | | | | | | Merge branch 'pb/maint-1.6.2-userdiff-fix'Junio C Hamano2009-06-202-7/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | upload-archive: fix infinite loop on CygwinRené Scharfe2009-06-181-5/+7
| * | | | | | | | | | | | | | | | avoid exponential regex match for java and objc function namesPaolo Bonzini2009-06-181-2/+3
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |