| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'ls/p4-retry-thrice' | Junio C Hamano | 2017-01-18 | 1 | -0/+2 |
|\ |
|
| * | git-p4: do not pass '-r 0' to p4 commandsls/p4-retry-thrice | Igor Kushnir | 2016-12-29 | 1 | -0/+2 |
* | | Merge branch 'ls/p4-retry-thrice' | Junio C Hamano | 2016-12-16 | 1 | -0/+4 |
|\ \
| |/ |
|
| * | git-p4: add config to retry p4 commands; retry 3 times by default | Lars Schneider | 2016-12-05 | 1 | -0/+4 |
| * | Merge branch 'mm/doc-tt' | Junio C Hamano | 2016-07-13 | 1 | -11/+11 |
| |\ |
|
| * \ | Merge branch 'tr/doc-tt' | Junio C Hamano | 2016-06-27 | 1 | -2/+2 |
| |\ \ |
|
* | | | | git-p4: support updating an existing shelved changelistld/p4-update-shelve | Luke Diamand | 2016-12-05 | 1 | -0/+4 |
* | | | | git-p4: allow submit to create shelved changelists.vk/p4-submit-shelve | Vinicius Kursancew | 2016-11-29 | 1 | -0/+5 |
* | | | | Merge branch 'mm/doc-tt' into maint | Junio C Hamano | 2016-07-28 | 1 | -11/+11 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | doc: typeset HEAD and variants as literalmm/doc-tt | Matthieu Moy | 2016-06-28 | 1 | -1/+1 |
| * | | | doc: typeset long command-line options as literal | Matthieu Moy | 2016-06-28 | 1 | -10/+10 |
| | |/
| |/| |
|
* | | | Merge branch 'tr/doc-tt' into maint | Junio C Hamano | 2016-07-06 | 1 | -2/+2 |
|\ \ \
| |/ /
| | /
| |/
|/| |
|
| * | doc: more consistency in environment variables format | Tom Russello | 2016-06-08 | 1 | -1/+1 |
| * | doc: change environment variables format | Tom Russello | 2016-06-08 | 1 | -1/+1 |
* | | Merge branch 'ls/p4-map-user' | Junio C Hamano | 2016-04-06 | 1 | -0/+11 |
|\ \
| |/
|/| |
|
| * | git-p4: map a P4 user to Git author name and email addressls/p4-map-user | Lars Schneider | 2016-03-15 | 1 | -0/+11 |
* | | Documentation: fix git-p4 AsciiDoc formattingls/p4-doc-markup | Lars Schneider | 2016-03-23 | 1 | -5/+3 |
* | | Documentation: use ASCII quotation marks in git-p4 | Lars Schneider | 2016-03-21 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'ls/p4-keep-empty-commits' | Junio C Hamano | 2015-12-15 | 1 | -0/+4 |
|\ |
|
| * | git-p4: add option to keep empty commitsls/p4-keep-empty-commits | Lars Schneider | 2015-12-10 | 1 | -0/+4 |
* | | Merge branch 'ls/p4-lfs' | Junio C Hamano | 2015-10-15 | 1 | -0/+32 |
|\ \ |
|
| * | | git-p4: add support for large file systems | Lars Schneider | 2015-10-03 | 1 | -0/+32 |
| |/ |
|
* | | git-p4: add config git-p4.pathEncoding | Lars Schneider | 2015-09-03 | 1 | -0/+7 |
|/ |
|
* | git-p4: use -m when running p4 changesls/p4-changes-block-size | Lex Spoon | 2015-04-20 | 1 | -3/+14 |
* | git-p4: support excluding paths on syncld/p4-exclude-in-sync | Luke Diamand | 2015-02-11 | 1 | -3/+3 |
* | git p4 doc: use two-line style for options with multiple spellingspw/git-p4 | Pete Wyckoff | 2014-01-22 | 1 | -2/+4 |
* | Change "remote tracking" to "remote-tracking"ms/remote-tracking-branches-in-doc | Michael Schubert | 2013-07-03 | 1 | -7/+10 |
* | Merge branch 'ta/doc-no-small-caps' | Junio C Hamano | 2013-02-05 | 1 | -42/+42 |
|\ |
|
| * | Documentation: the name of the system is 'Git', not 'git' | Thomas Ackermann | 2013-02-01 | 1 | -42/+42 |
* | | git p4: fix submit when no master branch | Pete Wyckoff | 2013-01-15 | 1 | -0/+5 |
* | | git p4: fix sync --branch when no master branch | Pete Wyckoff | 2013-01-15 | 1 | -0/+5 |
* | | git p4: allow short ref names to --branch | Pete Wyckoff | 2013-01-15 | 1 | -2/+5 |
* | | git p4 doc: fix branch detection example | Pete Wyckoff | 2013-01-15 | 1 | -1/+3 |
* | | git p4: clone --branch should checkout master | Pete Wyckoff | 2013-01-15 | 1 | -2/+1 |
|/ |
|
* | git-p4: add submit --conflict option and config varaiable | Pete Wyckoff | 2012-09-16 | 1 | -0/+11 |
* | git p4: add submit --prepare-p4-only option | Pete Wyckoff | 2012-09-16 | 1 | -0/+7 |
* | git p4: add submit --dry-run option | Pete Wyckoff | 2012-09-16 | 1 | -0/+4 |
* | git p4: accept -v for --verbose | Pete Wyckoff | 2012-09-16 | 1 | -1/+1 |
* | git p4: refactor diffOpts calculation | Gary Gibbons | 2012-07-05 | 1 | -4/+6 |
* | Sync with maint | Junio C Hamano | 2012-05-07 | 1 | -2/+3 |
|\ |
|
| * | git p4 doc: fix formatting | Pete Wyckoff | 2012-05-07 | 1 | -1/+3 |
* | | git p4: move verbose to base class | Luke Diamand | 2012-04-24 | 1 | -7/+4 |
* | | git p4: fix-up "import/export of labels to/from p4" | Luke Diamand | 2012-04-24 | 1 | -10/+10 |
* | | git p4: import/export of labels to/from p4 | Luke Diamand | 2012-04-11 | 1 | -5/+38 |
* | | git-p4: move to toplevel | Pete Wyckoff | 2012-04-09 | 1 | -13/+6 |
|/ |
|
* | Merge branch 'maint' | Junio C Hamano | 2012-02-26 | 1 | -3/+7 |
|\ |
|
| * | git-p4: set useClientSpec variable on initial clone | Pete Wyckoff | 2012-02-26 | 1 | -3/+7 |
* | | git-p4: add initial support for RCS keywordsld/git-p4-expanded-keywords | Luke Diamand | 2012-02-23 | 1 | -0/+5 |
* | | git-p4: add tests demonstrating spec overlay ambiguitiespw/p4-view-updates | Pete Wyckoff | 2012-01-11 | 1 | -0/+5 |
|/ |
|
* | git-p4: view spec documentation | Pete Wyckoff | 2012-01-03 | 1 | -13/+27 |