aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-p4.txt
Commit message (Expand)AuthorAge
* Merge branch 'ls/p4-retry-thrice'Junio C Hamano2017-01-18
|\
| * git-p4: do not pass '-r 0' to p4 commandsIgor Kushnir2016-12-29
* | Merge branch 'ls/p4-retry-thrice'Junio C Hamano2016-12-16
|\ \ | |/
| * git-p4: add config to retry p4 commands; retry 3 times by defaultLars Schneider2016-12-05
| * Merge branch 'mm/doc-tt'Junio C Hamano2016-07-13
| |\
| * \ Merge branch 'tr/doc-tt'Junio C Hamano2016-06-27
| |\ \
* | | | git-p4: support updating an existing shelved changelistLuke Diamand2016-12-05
* | | | git-p4: allow submit to create shelved changelists.Vinicius Kursancew2016-11-29
* | | | Merge branch 'mm/doc-tt' into maintJunio C Hamano2016-07-28
|\ \ \ \ | | |_|/ | |/| |
| * | | doc: typeset HEAD and variants as literalMatthieu Moy2016-06-28
| * | | doc: typeset long command-line options as literalMatthieu Moy2016-06-28
| | |/ | |/|
* | | Merge branch 'tr/doc-tt' into maintJunio C Hamano2016-07-06
|\ \ \ | |/ / | | / | |/ |/|
| * doc: more consistency in environment variables formatTom Russello2016-06-08
| * doc: change environment variables formatTom Russello2016-06-08
* | Merge branch 'ls/p4-map-user'Junio C Hamano2016-04-06
|\ \ | |/ |/|
| * git-p4: map a P4 user to Git author name and email addressLars Schneider2016-03-15
* | Documentation: fix git-p4 AsciiDoc formattingLars Schneider2016-03-23
* | Documentation: use ASCII quotation marks in git-p4Lars Schneider2016-03-21
|/
* Merge branch 'ls/p4-keep-empty-commits'Junio C Hamano2015-12-15
|\
| * git-p4: add option to keep empty commitsLars Schneider2015-12-10
* | Merge branch 'ls/p4-lfs'Junio C Hamano2015-10-15
|\ \
| * | git-p4: add support for large file systemsLars Schneider2015-10-03
| |/
* | git-p4: add config git-p4.pathEncodingLars Schneider2015-09-03
|/
* git-p4: use -m when running p4 changesLex Spoon2015-04-20
* git-p4: support excluding paths on syncLuke Diamand2015-02-11
* git p4 doc: use two-line style for options with multiple spellingsPete Wyckoff2014-01-22
* Change "remote tracking" to "remote-tracking"Michael Schubert2013-07-03
* Merge branch 'ta/doc-no-small-caps'Junio C Hamano2013-02-05
|\
| * Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-01
* | git p4: fix submit when no master branchPete Wyckoff2013-01-15
* | git p4: fix sync --branch when no master branchPete Wyckoff2013-01-15
* | git p4: allow short ref names to --branchPete Wyckoff2013-01-15
* | git p4 doc: fix branch detection examplePete Wyckoff2013-01-15
* | git p4: clone --branch should checkout masterPete Wyckoff2013-01-15
|/
* git-p4: add submit --conflict option and config varaiablePete Wyckoff2012-09-16
* git p4: add submit --prepare-p4-only optionPete Wyckoff2012-09-16
* git p4: add submit --dry-run optionPete Wyckoff2012-09-16
* git p4: accept -v for --verbosePete Wyckoff2012-09-16
* git p4: refactor diffOpts calculationGary Gibbons2012-07-05
* Sync with maintJunio C Hamano2012-05-07
|\
| * git p4 doc: fix formattingPete Wyckoff2012-05-07
* | git p4: move verbose to base classLuke Diamand2012-04-24
* | git p4: fix-up "import/export of labels to/from p4"Luke Diamand2012-04-24
* | git p4: import/export of labels to/from p4Luke Diamand2012-04-11
* | git-p4: move to toplevelPete Wyckoff2012-04-09
|/
* Merge branch 'maint'Junio C Hamano2012-02-26
|\
| * git-p4: set useClientSpec variable on initial clonePete Wyckoff2012-02-26
* | git-p4: add initial support for RCS keywordsLuke Diamand2012-02-23
* | git-p4: add tests demonstrating spec overlay ambiguitiesPete Wyckoff2012-01-11
|/
* git-p4: view spec documentationPete Wyckoff2012-01-03