Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-p4: label import fails with multiple labels at the same changelistld/git-p4-branches-and-labels | Luke Diamand | 2012-01-20 | 1 | -0/+41 |
* | git-p4: add test for p4 labels | Luke Diamand | 2012-01-20 | 1 | -0/+72 |
* | git-p4: importing labels should cope with missing owner | Luke Diamand | 2012-01-20 | 1 | -28/+35 |
* | git-p4: cope with labels with empty descriptions | Luke Diamand | 2012-01-20 | 1 | -3/+5 |
* | git-p4: handle p4 branches and labels containing shell chars | Luke Diamand | 2012-01-20 | 2 | -4/+52 |
* | Merge branch 'pw/p4-view-updates' | Junio C Hamano | 2012-01-06 | 3 | -82/+564 |
|\ | |||||
| * | git-p4: view spec documentation | Pete Wyckoff | 2012-01-03 | 1 | -13/+27 |
| * | git-p4: rewrite view handling | Pete Wyckoff | 2012-01-03 | 2 | -101/+258 |
| * | git-p4: support single file p4 client view maps | Gary Gibbons | 2012-01-03 | 2 | -10/+21 |
| * | git-p4: sort client views by reverse View number | Gary Gibbons | 2012-01-03 | 2 | -3/+10 |
| * | git-p4: fix test for unsupported P4 Client Views | Gary Gibbons | 2012-01-03 | 2 | -3/+6 |
| * | git-p4: test client view handling | Pete Wyckoff | 2012-01-03 | 1 | -0/+290 |
* | | Sync with 1.7.8.3 | Junio C Hamano | 2012-01-06 | 3 | -5/+24 |
|\ \ | |||||
| * | | Git 1.7.8.3v1.7.8.3 | Junio C Hamano | 2012-01-06 | 4 | -3/+22 |
| * | | Merge branch 'jn/maint-gitweb-utf8-fix' into maint | Junio C Hamano | 2012-01-06 | 1 | -4/+8 |
| |\ \ | |||||
| * \ \ | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2012-01-06 | 1 | -4/+4 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-06 | 1 | -4/+4 |
| | |\ \ \ | |||||
| | | * | | | Documentation: rerere.enabled is the primary way to configure rerere | Thomas Rast | 2012-01-06 | 1 | -4/+4 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-01-04 | 2 | -4/+7 |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | |||||
| * | | | | t5550: repack everything into one file | Clemens Buchacher | 2012-01-04 | 1 | -2/+1 |
| * | | | | Merge branch 'nd/maint-parse-depth' into maint | Junio C Hamano | 2012-01-04 | 1 | -2/+6 |
| |\ \ \ \ | |||||
| | * | | | | Catch invalid --depth option passed to clone or fetchnd/maint-parse-depth | Nguyễn Thái Ngọc Duy | 2012-01-04 | 1 | -2/+6 |
* | | | | | | Merge branch 'pw/p4-docs-and-tests' | Junio C Hamano | 2012-01-03 | 10 | -343/+830 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-p4: document and test submit optionspw/p4-docs-and-tests | Pete Wyckoff | 2011-12-27 | 3 | -2/+67 |
| * | | | | | | git-p4: test and document --use-client-spec | Pete Wyckoff | 2011-12-27 | 3 | -2/+55 |
| * | | | | | | git-p4: test --keep-path | Pete Wyckoff | 2011-12-27 | 1 | -0/+24 |
| * | | | | | | git-p4: test --max-changes | Pete Wyckoff | 2011-12-27 | 1 | -0/+10 |
| * | | | | | | git-p4: document and test --import-local | Pete Wyckoff | 2011-12-27 | 2 | -1/+25 |
| * | | | | | | git-p4: honor --changesfile option and test | Pete Wyckoff | 2011-12-27 | 2 | -1/+38 |
| * | | | | | | git-p4: document and test clone --branch | Pete Wyckoff | 2011-12-27 | 2 | -1/+20 |
| * | | | | | | git-p4: test cloning with two dirs, clarify doc | Pete Wyckoff | 2011-12-27 | 2 | -2/+69 |
| * | | | | | | git-p4: clone does not use --git-dir | Pete Wyckoff | 2011-12-27 | 2 | -1/+36 |
| * | | | | | | git-p4: introduce asciidoc documentation | Pete Wyckoff | 2011-12-27 | 2 | -302/+455 |
| * | | | | | | rename git-p4 tests | Pete Wyckoff | 2011-12-27 | 5 | -0/+0 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-01-03 | 5 | -8/+19 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2012-01-03 | 3 | -6/+11 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-03 | 2 | -5/+5 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Documentation: read-tree --prefix works with existing subtrees | Clemens Buchacher | 2012-01-01 | 1 | -5/+4 |
| | | * | | | | Add MYMETA.json to perl/.gitignore | Jack Nagel | 2011-12-29 | 1 | -0/+1 |
| | | | |/ / | | | |/| | | |||||
| | * | | | | docs: describe behavior of relative submodule URLs | Jens Lehmann | 2012-01-03 | 1 | -1/+6 |
| * | | | | | fix hang in git fetch if pointed at a 0 length bundle | Brian Harring | 2012-01-03 | 2 | -2/+8 |
* | | | | | | Update draft release notes to 1.7.9 | Junio C Hamano | 2011-12-28 | 1 | -72/+4 |
* | | | | | | Sync with 1.7.8.2 | Junio C Hamano | 2011-12-28 | 2 | -1/+72 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Git 1.7.8.2v1.7.8.2 | Junio C Hamano | 2011-12-28 | 3 | -2/+73 |
| * | | | | | Merge branch 'jv/maint-config-set' into maint | Junio C Hamano | 2011-12-28 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix an incorrect reference to --set-all.jv/maint-config-set | Jelmer Vernooij | 2011-12-27 | 1 | -1/+1 |
| * | | | | | | Merge branch 'jk/follow-rename-score' into maint | Junio C Hamano | 2011-12-28 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jc/checkout-m-twoway' into maint | Junio C Hamano | 2011-12-28 | 2 | -24/+85 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'tr/doc-sh-setup' into maint | Junio C Hamano | 2011-12-28 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-strbuf-missing-init' into maint | Junio C Hamano | 2011-12-28 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ |