summaryrefslogtreecommitdiffstats
path: root/git-p4.py
AgeCommit message (Expand)AuthorLines
2013-07-19Merge branch 'vl/typofix' into maintJunio C Hamano-1/+1
2013-06-19random typofixes (committed missing a 't', successful missing an 's')Veres Lajos-1/+1
2013-03-11git p4: avoid expanding client paths in chdirMiklós Fazekas-7/+22
2013-02-04Merge branch 'pw/git-p4-on-cygwin'Junio C Hamano-39/+80
2013-02-01Merge branch 'bc/git-p4-for-python-2.4'Junio C Hamano-4/+26
2013-01-26git p4: introduce gitConfigBoolPete Wyckoff-19/+26
2013-01-26git p4: avoid shell when calling git configPete Wyckoff-6/+9
2013-01-26git p4: avoid shell when invoking git config --get-allPete Wyckoff-1/+2
2013-01-26git p4: avoid shell when invoking git rev-listPete Wyckoff-2/+3
2013-01-26git p4: avoid shell when mapping usersPete Wyckoff-1/+2
2013-01-26git p4: disable read-only attribute before deletingPete Wyckoff-0/+10
2013-01-26git p4: scrub crlf for utf16 files on windowsPete Wyckoff-1/+23
2013-01-26git p4: remove unreachable windows \r\n conversion codePete Wyckoff-9/+0
2013-01-26git p4: generate better error message for bad depot pathPete Wyckoff-0/+1
2013-01-26git p4: remove unused importsPete Wyckoff-5/+9
2013-01-26git p4: temp branch name should use / even on windowsPete Wyckoff-1/+1
2013-01-26git-p4.py: support Python 2.4Brandon Casey-3/+24
2013-01-26git-p4.py: support Python 2.5Brandon Casey-1/+2
2013-01-21Merge branch 'pw/p4-branch-fixes'Junio C Hamano-45/+107
2013-01-15git p4: fix submit when no master branchPete Wyckoff-1/+5
2013-01-15git p4: fix sync --branch when no master branchPete Wyckoff-3/+11
2013-01-15git p4: fail gracefully on sync with no master branchPete Wyckoff-2/+27
2013-01-15git p4: rearrange self.initialParent usePete Wyckoff-3/+9
2013-01-15git p4: allow short ref names to --branchPete Wyckoff-1/+11
2013-01-15git p4: clone --branch should checkout masterPete Wyckoff-11/+9
2013-01-15git p4: create p4/HEAD on initial clonePete Wyckoff-4/+8
2013-01-15git p4: inline listExistingP4GitBranchesPete Wyckoff-8/+6
2013-01-15git p4: add comments to p4BranchesInGitPete Wyckoff-8/+17
2013-01-15git p4: rearrange and simplify hasOrigin handlingPete Wyckoff-7/+7
2012-12-28Add checks to Python scripts for version dependencies.Eric S. Raymond-1/+7
2012-11-26git p4: remove unneeded cmd initializationPete Wyckoff-1/+0
2012-11-26git p4: fix labelDetails typo in exceptionPete Wyckoff-1/+1
2012-11-26git p4: catch p4 errors when streaming file contentsPete Wyckoff-7/+31
2012-11-26git p4: handle servers without move supportPete Wyckoff-1/+20
2012-11-26git p4: catch p4 describe errorsPete Wyckoff-9/+26
2012-11-20Merge branch 'pw/maint-p4-rcs-expansion-newline'Junio C Hamano-1/+1
2012-11-08git p4: RCS expansion should not span newlinesPete Wyckoff-1/+1
2012-09-18Merge branch 'pw/p4-submit-conflicts'Junio C Hamano-55/+184
2012-09-16git-p4: add submit --conflict option and config varaiablePete Wyckoff-5/+31
2012-09-16git p4: add submit --prepare-p4-only optionPete Wyckoff-0/+46
2012-09-16git p4: add submit --dry-run optionPete Wyckoff-13/+30
2012-09-16git p4: accept -v for --verbosePete Wyckoff-1/+1
2012-09-16git p4: revert deleted files after submit cancelPete Wyckoff-0/+2
2012-09-16git p4: rearrange submit template constructionPete Wyckoff-8/+21
2012-09-16git p4: test clean-up after failed submit, fix added filesPete Wyckoff-2/+0
2012-09-16git p4: standardize submit cancel due to unchanged templatePete Wyckoff-1/+3
2012-09-16git p4: move conflict prompt into run, add [q]uit inputPete Wyckoff-12/+29
2012-09-16git p4: remove submit failure options [a]pply and [w]ritePete Wyckoff-18/+2
2012-09-16git p4: gracefully fail if some commits could not be appliedPete Wyckoff-9/+33
2012-08-20git p4: make branch detection work with --use-client-specPete Wyckoff-6/+31