summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* upload-pack: avoid parsing objects during ref advertisementJeff King2012-01-061-3/+7
* parse_object: try internal cache before reading object dbJeff King2012-01-051-2/+7
* Merge branch 'maint'Junio C Hamano2012-01-042-4/+7
|\
| * t5550: repack everything into one fileClemens Buchacher2012-01-041-2/+1
| * Merge branch 'nd/maint-parse-depth' into maintJunio C Hamano2012-01-041-2/+6
| |\
| | * Catch invalid --depth option passed to clone or fetchnd/maint-parse-depthNguyễn Thái Ngọc Duy2012-01-041-2/+6
* | | Merge branch 'pw/p4-docs-and-tests'Junio C Hamano2012-01-0310-343/+830
|\ \ \
| * | | git-p4: document and test submit optionspw/p4-docs-and-testsPete Wyckoff2011-12-273-2/+67
| * | | git-p4: test and document --use-client-specPete Wyckoff2011-12-273-2/+55
| * | | git-p4: test --keep-pathPete Wyckoff2011-12-271-0/+24
| * | | git-p4: test --max-changesPete Wyckoff2011-12-271-0/+10
| * | | git-p4: document and test --import-localPete Wyckoff2011-12-272-1/+25
| * | | git-p4: honor --changesfile option and testPete Wyckoff2011-12-272-1/+38
| * | | git-p4: document and test clone --branchPete Wyckoff2011-12-272-1/+20
| * | | git-p4: test cloning with two dirs, clarify docPete Wyckoff2011-12-272-2/+69
| * | | git-p4: clone does not use --git-dirPete Wyckoff2011-12-272-1/+36
| * | | git-p4: introduce asciidoc documentationPete Wyckoff2011-12-272-302/+455
| * | | rename git-p4 testsPete Wyckoff2011-12-275-0/+0
* | | | Merge branch 'maint'Junio C Hamano2012-01-035-8/+19
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-033-6/+11
| |\ \ \
| | * \ \ Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-032-5/+5
| | |\ \ \
| | | * | | Documentation: read-tree --prefix works with existing subtreesClemens Buchacher2012-01-011-5/+4
| | | * | | Add MYMETA.json to perl/.gitignoreJack Nagel2011-12-291-0/+1
| | | | |/ | | | |/|
| | * | | docs: describe behavior of relative submodule URLsJens Lehmann2012-01-031-1/+6
| * | | | fix hang in git fetch if pointed at a 0 length bundleBrian Harring2012-01-032-2/+8
* | | | | Update draft release notes to 1.7.9Junio C Hamano2011-12-281-72/+4
* | | | | Sync with 1.7.8.2Junio C Hamano2011-12-282-1/+72
|\ \ \ \ \ | |/ / / /
| * | | | Git 1.7.8.2v1.7.8.2Junio C Hamano2011-12-283-2/+73
| * | | | Merge branch 'jv/maint-config-set' into maintJunio C Hamano2011-12-281-1/+1
| |\ \ \ \
| | * | | | Fix an incorrect reference to --set-all.jv/maint-config-setJelmer Vernooij2011-12-271-1/+1
| * | | | | Merge branch 'jk/follow-rename-score' into maintJunio C Hamano2011-12-281-0/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/checkout-m-twoway' into maintJunio C Hamano2011-12-282-24/+85
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tr/doc-sh-setup' into maintJunio C Hamano2011-12-281-0/+10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/maint-strbuf-missing-init' into maintJunio C Hamano2011-12-282-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/maint-push-v-is-verbose' into maintJunio C Hamano2011-12-281-5/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/http-push-to-empty' into maintJunio C Hamano2011-12-282-3/+36
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/doc-fsck' into maintJunio C Hamano2011-12-281-18/+8
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maintJunio C Hamano2011-12-281-10/+50
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ef/setenv-putenv' into maintJunio C Hamano2011-12-281-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/advice-doc' into maintJunio C Hamano2011-12-281-11/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-sequencer-fixes' into maintJunio C Hamano2011-12-286-126/+252
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-snprintf-va-copy' into maintJunio C Hamano2011-12-281-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-push-over-dav' into maintJunio C Hamano2011-12-287-5/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-mv' into maintJunio C Hamano2011-12-282-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fetch-no-tail-match-refs' into maintJunio C Hamano2011-12-288-41/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/keepalive' into maintJunio C Hamano2011-12-281-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ci/stripspace-docs' into maintJunio C Hamano2011-12-282-7/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/fast-import-notes' into maintJunio C Hamano2011-12-282-8/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maintJunio C Hamano2011-12-281-13/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tj/maint-imap-send-remove-unused' into maintJunio C Hamano2011-12-281-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status