summaryrefslogtreecommitdiff
path: root/Documentation/git-p4.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ls/p4-retry-thrice'Junio C Hamano2017-01-181-0/+2
|\
| * git-p4: do not pass '-r 0' to p4 commandsls/p4-retry-thriceIgor Kushnir2016-12-291-0/+2
* | Merge branch 'ls/p4-retry-thrice'Junio C Hamano2016-12-161-0/+4
|\ \ | |/
| * git-p4: add config to retry p4 commands; retry 3 times by defaultLars Schneider2016-12-051-0/+4
| * Merge branch 'mm/doc-tt'Junio C Hamano2016-07-131-11/+11
| |\
| * \ Merge branch 'tr/doc-tt'Junio C Hamano2016-06-271-2/+2
| |\ \
* | | | git-p4: support updating an existing shelved changelistld/p4-update-shelveLuke Diamand2016-12-051-0/+4
* | | | git-p4: allow submit to create shelved changelists.vk/p4-submit-shelveVinicius Kursancew2016-11-291-0/+5
* | | | Merge branch 'mm/doc-tt' into maintJunio C Hamano2016-07-281-11/+11
|\ \ \ \ | | |_|/ | |/| |
| * | | doc: typeset HEAD and variants as literalmm/doc-ttMatthieu Moy2016-06-281-1/+1
| * | | doc: typeset long command-line options as literalMatthieu Moy2016-06-281-10/+10
| | |/ | |/|
* | | Merge branch 'tr/doc-tt' into maintJunio C Hamano2016-07-061-2/+2
|\ \ \ | |/ / | | / | |/ |/|
| * doc: more consistency in environment variables formatTom Russello2016-06-081-1/+1
| * doc: change environment variables formatTom Russello2016-06-081-1/+1
* | Merge branch 'ls/p4-map-user'Junio C Hamano2016-04-061-0/+11
|\ \ | |/ |/|
| * git-p4: map a P4 user to Git author name and email addressls/p4-map-userLars Schneider2016-03-151-0/+11
* | Documentation: fix git-p4 AsciiDoc formattingls/p4-doc-markupLars Schneider2016-03-231-5/+3
* | Documentation: use ASCII quotation marks in git-p4Lars Schneider2016-03-211-1/+1
|/
* Merge branch 'ls/p4-keep-empty-commits'Junio C Hamano2015-12-151-0/+4
|\
| * git-p4: add option to keep empty commitsls/p4-keep-empty-commitsLars Schneider2015-12-101-0/+4
* | Merge branch 'ls/p4-lfs'Junio C Hamano2015-10-151-0/+32
|\ \
| * | git-p4: add support for large file systemsLars Schneider2015-10-031-0/+32
| |/
* | git-p4: add config git-p4.pathEncodingLars Schneider2015-09-031-0/+7
|/
* git-p4: use -m when running p4 changesls/p4-changes-block-sizeLex Spoon2015-04-201-3/+14
* git-p4: support excluding paths on syncld/p4-exclude-in-syncLuke Diamand2015-02-111-3/+3
* git p4 doc: use two-line style for options with multiple spellingspw/git-p4Pete Wyckoff2014-01-221-2/+4
* Change "remote tracking" to "remote-tracking"ms/remote-tracking-branches-in-docMichael Schubert2013-07-031-7/+10
* Merge branch 'ta/doc-no-small-caps'Junio C Hamano2013-02-051-42/+42
|\
| * Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-011-42/+42
* | git p4: fix submit when no master branchPete Wyckoff2013-01-151-0/+5
* | git p4: fix sync --branch when no master branchPete Wyckoff2013-01-151-0/+5
* | git p4: allow short ref names to --branchPete Wyckoff2013-01-151-2/+5
* | git p4 doc: fix branch detection examplePete Wyckoff2013-01-151-1/+3
* | git p4: clone --branch should checkout masterPete Wyckoff2013-01-151-2/+1
|/
* git-p4: add submit --conflict option and config varaiablePete Wyckoff2012-09-161-0/+11
* git p4: add submit --prepare-p4-only optionPete Wyckoff2012-09-161-0/+7
* git p4: add submit --dry-run optionPete Wyckoff2012-09-161-0/+4
* git p4: accept -v for --verbosePete Wyckoff2012-09-161-1/+1
* git p4: refactor diffOpts calculationGary Gibbons2012-07-051-4/+6
* Sync with maintJunio C Hamano2012-05-071-2/+3
|\
| * git p4 doc: fix formattingPete Wyckoff2012-05-071-1/+3
* | git p4: move verbose to base classLuke Diamand2012-04-241-7/+4
* | git p4: fix-up "import/export of labels to/from p4"Luke Diamand2012-04-241-10/+10
* | git p4: import/export of labels to/from p4Luke Diamand2012-04-111-5/+38
* | git-p4: move to toplevelPete Wyckoff2012-04-091-13/+6
|/
* Merge branch 'maint'Junio C Hamano2012-02-261-3/+7
|\
| * git-p4: set useClientSpec variable on initial clonePete Wyckoff2012-02-261-3/+7
* | git-p4: add initial support for RCS keywordsld/git-p4-expanded-keywordsLuke Diamand2012-02-231-0/+5
* | git-p4: add tests demonstrating spec overlay ambiguitiespw/p4-view-updatesPete Wyckoff2012-01-111-0/+5
|/
* git-p4: view spec documentationPete Wyckoff2012-01-031-13/+27
View Lorry Controller Status