summaryrefslogtreecommitdiff
path: root/git-p4.py
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | git p4: fix submit when no master branchPete Wyckoff2013-01-151-1/+5
| * | git p4: fix sync --branch when no master branchPete Wyckoff2013-01-151-3/+11
| * | git p4: fail gracefully on sync with no master branchPete Wyckoff2013-01-151-2/+27
| * | git p4: rearrange self.initialParent usePete Wyckoff2013-01-151-3/+9
| * | git p4: allow short ref names to --branchPete Wyckoff2013-01-151-1/+11
| * | git p4: clone --branch should checkout masterPete Wyckoff2013-01-151-11/+9
| * | git p4: create p4/HEAD on initial clonePete Wyckoff2013-01-151-4/+8
| * | git p4: inline listExistingP4GitBranchesPete Wyckoff2013-01-151-8/+6
| * | git p4: add comments to p4BranchesInGitPete Wyckoff2013-01-151-8/+17
| * | git p4: rearrange and simplify hasOrigin handlingPete Wyckoff2013-01-151-7/+7
| |/
* | Add checks to Python scripts for version dependencies.Eric S. Raymond2012-12-281-1/+7
|/
* git p4: remove unneeded cmd initializationPete Wyckoff2012-11-261-1/+0
* git p4: fix labelDetails typo in exceptionPete Wyckoff2012-11-261-1/+1
* git p4: catch p4 errors when streaming file contentsPete Wyckoff2012-11-261-7/+31
* git p4: handle servers without move supportPete Wyckoff2012-11-261-1/+20
* git p4: catch p4 describe errorsPete Wyckoff2012-11-261-9/+26
* Merge branch 'pw/maint-p4-rcs-expansion-newline'Junio C Hamano2012-11-201-1/+1
|\
| * git p4: RCS expansion should not span newlinesPete Wyckoff2012-11-081-1/+1
View Lorry Controller Status