summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-p4: label import fails with multiple labels at the same changelistld/git-p4-branches-and-labelsLuke Diamand2012-01-201-0/+41
* git-p4: add test for p4 labelsLuke Diamand2012-01-201-0/+72
* git-p4: importing labels should cope with missing ownerLuke Diamand2012-01-201-28/+35
* git-p4: cope with labels with empty descriptionsLuke Diamand2012-01-201-3/+5
* git-p4: handle p4 branches and labels containing shell charsLuke Diamand2012-01-202-4/+52
* Merge branch 'pw/p4-view-updates'Junio C Hamano2012-01-063-82/+564
|\
| * git-p4: view spec documentationPete Wyckoff2012-01-031-13/+27
| * git-p4: rewrite view handlingPete Wyckoff2012-01-032-101/+258
| * git-p4: support single file p4 client view mapsGary Gibbons2012-01-032-10/+21
| * git-p4: sort client views by reverse View numberGary Gibbons2012-01-032-3/+10
| * git-p4: fix test for unsupported P4 Client ViewsGary Gibbons2012-01-032-3/+6
| * git-p4: test client view handlingPete Wyckoff2012-01-031-0/+290
* | Sync with 1.7.8.3Junio C Hamano2012-01-063-5/+24
|\ \
| * | Git 1.7.8.3v1.7.8.3Junio C Hamano2012-01-064-3/+22
| * | Merge branch 'jn/maint-gitweb-utf8-fix' into maintJunio C Hamano2012-01-061-4/+8
| |\ \
| * \ \ Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-061-4/+4
| |\ \ \
| | * \ \ Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-061-4/+4
| | |\ \ \
| | | * | | Documentation: rerere.enabled is the primary way to configure rerereThomas Rast2012-01-061-4/+4
* | | | | | 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
| |\ \ \ \ \ \ \ \ \