summaryrefslogtreecommitdiff
path: root/git-p4.py
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh/p4-multi-depot'Junio C Hamano2015-12-281-25/+30
|\
| * git-p4: reduce number of server queries for fetchessh/p4-multi-depotSam Hocevar2015-12-211-23/+21
| * git-p4: support multiple depot paths in p4 submitSam Hocevar2015-12-211-2/+9
* | Merge branch 'ls/p4-keep-empty-commits'Junio C Hamano2015-12-151-17/+27
|\ \ | |/ |/|
| * git-p4: add option to keep empty commitsls/p4-keep-empty-commitsLars Schneider2015-12-101-17/+27
* | Merge branch 'maint'Jeff King2015-12-011-43/+57
|\ \
| * \ Merge branch 'eg/p4-submit-catch-failure' into maintJeff King2015-12-011-34/+37
| |\ \
| | * | git-p4: clean up after p4 submit failureeg/p4-submit-catch-failureGIRARD Etienne2015-11-241-34/+37
| * | | Merge branch 'ld/p4-detached-head' into maintJeff King2015-12-011-9/+20
| |\ \ \
| | * | | git-p4: work with a detached headld/p4-detached-headLuke Diamand2015-11-241-7/+16
| | * | | git-p4: add option to system() to return subshell statusLuke Diamand2015-11-241-2/+4
| | |/ /
| * | | Merge branch 'ls/p4-translation-failure' into maintJunio C Hamano2015-11-031-11/+16
| |\ \ \
| * \ \ \ Merge branch 'ld/p4-import-labels' into maintJunio C Hamano2015-11-031-8/+17
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge branch 'dk/p4-import-ctypes'Junio C Hamano2015-10-261-0/+1
|\ \ \ \ \
| * | | | | git-p4: import the ctypes moduledk/p4-import-ctypesDennis Kaarsemaker2015-10-201-0/+1
* | | | | | Merge branch 'ls/p4-lfs'Junio C Hamano2015-10-151-16/+254
|\ \ \ \ \ \
| * | | | | | git-p4: add Git LFS backend for large file systemLars Schneider2015-10-031-0/+72
| * | | | | | git-p4: add support for large file systemsLars Schneider2015-10-031-10/+129
| |/ / / / /
| * | | | | git-p4: check free space during streamingLars Schneider2015-10-031-0/+18
| * | | | | git-p4: add file streaming progress in verbose modeLars Schneider2015-10-031-2/+18
| * | | | | git-p4: return an empty list if a list config has no valuesLars Schneider2015-10-031-0/+2
| * | | | | git-p4: add gitConfigInt readerLars Schneider2015-10-031-0/+11
| * | | | | git-p4: add optional type specifier to gitConfig readerLars Schneider2015-10-031-6/+6
| |/ / / /
* | | | | Merge branch 'ls/p4-translation-failure'Junio C Hamano2015-10-151-11/+16
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | git-p4: handle "Translation of file content failed"ls/p4-translation-failureLars Schneider2015-09-221-11/+16
| |/ / /
* | | | Merge branch 'ls/p4-path-encoding'Junio C Hamano2015-10-071-0/+10
|\ \ \ \
| * | | | git-p4: use replacement character for non UTF-8 characters in pathsLars Schneider2015-09-211-1/+1
| * | | | git-p4: improve path encoding verbose outputLars Schneider2015-09-161-10/+9
| * | | | git-p4: add config git-p4.pathEncodingLars Schneider2015-09-031-0/+11
* | | | | Merge branch 'ld/p4-import-labels'Junio C Hamano2015-10-051-8/+17
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | git-p4: fix P4 label import for unprocessed commitsld/p4-import-labelsLuke Diamand2015-08-281-8/+17
| * | | git-p4: do not terminate creating tag for unknown commitLuke Diamand2015-08-281-2/+2
| |/ /
* | | git-p4: honor core.ignorecase when using P4 client specsls/p4-fold-case-client-specsLars Schneider2015-08-281-0/+7
|/ /
* | Merge branch 'ld/p4-changes-block-size'Junio C Hamano2015-06-241-22/+63
|\ \
| * | git-p4: fixing --changes-block-size handlingld/p4-changes-block-sizeLuke Diamand2015-06-101-22/+63
* | | Merge branch 'mt/p4-depotFile-at-version'Junio C Hamano2015-06-111-1/+1
|\ \ \ | |/ / |/| |
| * | p4: retrieve the right revision of the file in UTF-16 codepathmt/p4-depotFile-at-versionMiguel Torroja2015-05-271-1/+1
* | | Merge branch 'ld/p4-editor-multi-words'Junio C Hamano2015-06-051-1/+1
|\ \ \ | |/ / |/| |
| * | git-p4: fix handling of multi-word P4EDITORLuke Diamand2015-05-241-1/+1
* | | Merge branch 'va/p4-client-path'Junio C Hamano2015-05-111-4/+9
|\ \ \ | |_|/ |/| |
| * | git-p4: improve client path detection when branches are usedva/p4-client-pathVitor Antunes2015-04-231-4/+9
* | | Merge branch 'ls/p4-changes-block-size'Junio C Hamano2015-05-111-11/+41
|\ \ \
| * | | git-p4: use -m when running p4 changesls/p4-changes-block-sizeLex Spoon2015-04-201-11/+41
| |/ /
* | | git-p4: fix filetype detection on files opened exclusivelyld/p4-filetype-detectionBlair Holloway2015-04-041-1/+1
|/ /
* | Merge branch 'ld/p4-submit-hint'Junio C Hamano2015-02-111-1/+1
|\ \
| * | git-p4: correct --prepare-p4-only instructionsld/p4-submit-hintLuke Diamand2015-01-231-1/+1
| |/
* | git-p4: support excluding paths on syncld/p4-exclude-in-syncLuke Diamand2015-02-111-10/+10
|/
* git-p4: fix submit in non --prepare-p4-only modemc/git-p4-prepare-p4-onlyMaxime Coste2014-06-131-6/+6
* git-p4: Do not include diff in spec file when just preparing p4mc/git-p4-pre-are-p4-onlyMaxime Coste2014-05-271-23/+26
* Merge branch 'cl/p4-use-diff-tree'Junio C Hamano2014-05-071-1/+1
|\
View Lorry Controller Status