summaryrefslogtreecommitdiff
path: root/git-p4.py
Commit message (Expand)AuthorAgeFilesLines
* git-p4: clean up after p4 submit failureeg/p4-submit-catch-failureGIRARD Etienne2015-11-241-34/+37
* 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
|\
| * git-p4: format-patch to diff-tree change breaks binary patchescl/p4-use-diff-treeTolga Ceylan2014-05-071-1/+1
* | git-p4: explicitly specify that HEAD is a revisionVlad Dogaru2014-04-071-1/+1
* | git p4: fix an error message when "p4 where" failsPete Wyckoff2014-01-221-1/+1
* | git p4: handle files with wildcards when doing RCS scrubbingPete Wyckoff2014-01-221-2/+2
* | git p4 test: do not pollute /tmpPete Wyckoff2014-01-221-1/+1
* | git p4: work around p4 bug that causes empty symlinksPete Wyckoff2014-01-221-1/+8
* | Merge branch 'cl/p4-use-diff-tree'Junio C Hamano2013-12-121-1/+1
|\ \ | |/
| * git p4: Use git diff-tree instead of format-patchCrestez Dan Leonard2013-11-221-1/+1
* | Merge branch 'ks/p4-view-spec'Junio C Hamano2013-09-181-164/+59
|\ \
| * | git p4: implement view spec wildcards with "p4 where"ks/p4-view-specKazuki Saitoh2013-09-031-164/+59
| |/
* | git-p4: Fix occasional truncation of symlink contents.aj/p4-symlink-lose-nlAlexandru Juncu2013-08-121-2/+6
|/
* many small typofixesob/typofixesOndřej Bílka2013-07-291-1/+1
* Merge branch 'vl/typofix'Junio C Hamano2013-06-261-1/+1
|\
| * random typofixes (committed missing a 't', successful missing an 's')Veres Lajos2013-06-191-1/+1
* | git p4: avoid expanding client paths in chdirMiklós Fazekas2013-03-111-7/+22
|/
* Merge branch 'pw/git-p4-on-cygwin'Junio C Hamano2013-02-041-39/+80
|\
| * git p4: introduce gitConfigBoolPete Wyckoff2013-01-261-19/+26
| * git p4: avoid shell when calling git configPete Wyckoff2013-01-261-6/+9
| * git p4: avoid shell when invoking git config --get-allPete Wyckoff2013-01-261-1/+2
| * git p4: avoid shell when invoking git rev-listPete Wyckoff2013-01-261-2/+3
| * git p4: avoid shell when mapping usersPete Wyckoff2013-01-261-1/+2
| * git p4: disable read-only attribute before deletingPete Wyckoff2013-01-261-0/+10
| * git p4: scrub crlf for utf16 files on windowsPete Wyckoff2013-01-261-1/+23
| * git p4: remove unreachable windows \r\n conversion codePete Wyckoff2013-01-261-9/+0
| * git p4: generate better error message for bad depot pathPete Wyckoff2013-01-261-0/+1
| * git p4: remove unused importsPete Wyckoff2013-01-261-5/+9
| * git p4: temp branch name should use / even on windowsPete Wyckoff2013-01-261-1/+1
* | Merge branch 'bc/git-p4-for-python-2.4'Junio C Hamano2013-02-011-4/+26
|\ \ | |/ |/|
| * git-p4.py: support Python 2.4Brandon Casey2013-01-261-3/+24
| * git-p4.py: support Python 2.5Brandon Casey2013-01-261-1/+2
* | Merge branch 'pw/p4-branch-fixes'Junio C Hamano2013-01-211-45/+107
|\ \
View Lorry Controller Status