aboutsummaryrefslogtreecommitdiffstats
path: root/git-p4.py (follow)
AgeCommit message (Expand)AuthorFilesLines
2013-01-26git p4: avoid shell when invoking git rev-listPete Wyckoff1-2/+3
2013-01-26git p4: avoid shell when mapping usersPete Wyckoff1-1/+2
2013-01-26git p4: disable read-only attribute before deletingPete Wyckoff1-0/+10
2013-01-26git p4: scrub crlf for utf16 files on windowsPete Wyckoff1-1/+23
2013-01-26git p4: remove unreachable windows \r\n conversion codePete Wyckoff1-9/+0
2013-01-26git p4: generate better error message for bad depot pathPete Wyckoff1-0/+1
2013-01-26git p4: remove unused importsPete Wyckoff1-5/+9
2013-01-26git p4: temp branch name should use / even on windowsPete Wyckoff1-1/+1
2013-01-26git-p4.py: support Python 2.4Brandon Casey1-3/+24
2013-01-26git-p4.py: support Python 2.5Brandon Casey1-1/+2
2013-01-21Merge branch 'pw/p4-branch-fixes'Junio C Hamano1-45/+107
2013-01-15git p4: fix submit when no master branchPete Wyckoff1-1/+5
2013-01-15git p4: fix sync --branch when no master branchPete Wyckoff1-3/+11
2013-01-15git p4: fail gracefully on sync with no master branchPete Wyckoff1-2/+27
2013-01-15git p4: rearrange self.initialParent usePete Wyckoff1-3/+9
2013-01-15git p4: allow short ref names to --branchPete Wyckoff1-1/+11
2013-01-15git p4: clone --branch should checkout masterPete Wyckoff1-11/+9
2013-01-15git p4: create p4/HEAD on initial clonePete Wyckoff1-4/+8
2013-01-15git p4: inline listExistingP4GitBranchesPete Wyckoff1-8/+6
2013-01-15git p4: add comments to p4BranchesInGitPete Wyckoff1-8/+17
2013-01-15git p4: rearrange and simplify hasOrigin handlingPete Wyckoff1-7/+7
2012-12-28Add checks to Python scripts for version dependencies.Eric S. Raymond1-1/+7
2012-11-26git p4: remove unneeded cmd initializationPete Wyckoff1-1/+0
2012-11-26git p4: fix labelDetails typo in exceptionPete Wyckoff1-1/+1
2012-11-26git p4: catch p4 errors when streaming file contentsPete Wyckoff1-7/+31
2012-11-26git p4: handle servers without move supportPete Wyckoff1-1/+20
2012-11-26git p4: catch p4 describe errorsPete Wyckoff1-9/+26
2012-11-20Merge branch 'pw/maint-p4-rcs-expansion-newline'Junio C Hamano1-1/+1
2012-11-08git p4: RCS expansion should not span newlinesPete Wyckoff1-1/+1
2012-09-18Merge branch 'pw/p4-submit-conflicts'Junio C Hamano1-55/+184
2012-09-16git-p4: add submit --conflict option and config varaiablePete Wyckoff1-5/+31
2012-09-16git p4: add submit --prepare-p4-only optionPete Wyckoff1-0/+46
2012-09-16git p4: add submit --dry-run optionPete Wyckoff1-13/+30
2012-09-16git p4: accept -v for --verbosePete Wyckoff1-1/+1
2012-09-16git p4: revert deleted files after submit cancelPete Wyckoff1-0/+2
2012-09-16git p4: rearrange submit template constructionPete Wyckoff1-8/+21
2012-09-16git p4: test clean-up after failed submit, fix added filesPete Wyckoff1-2/+0
2012-09-16git p4: standardize submit cancel due to unchanged templatePete Wyckoff1-1/+3
2012-09-16git p4: move conflict prompt into run, add [q]uit inputPete Wyckoff1-12/+29
2012-09-16git p4: remove submit failure options [a]pply and [w]ritePete Wyckoff1-18/+2
2012-09-16git p4: gracefully fail if some commits could not be appliedPete Wyckoff1-9/+33
2012-08-20git p4: make branch detection work with --use-client-specPete Wyckoff1-6/+31
2012-08-11git p4: do wildcard decoding in stripRepoPathPete Wyckoff1-9/+8
2012-08-11git p4: set self.branchPrefixes in initializationPete Wyckoff1-11/+14
2012-07-15Merge branch 'pw/git-p4-move'Junio C Hamano1-28/+58
2012-07-12git p4: add support for 'p4 move' in P4SubmitGary Gibbons1-8/+26
2012-07-05git p4: refactor diffOpts calculationGary Gibbons1-20/+32
2012-07-05git p4: notice Jobs lines in git commit messagesPete Wyckoff1-6/+40
2012-07-05git p4: remove unused P4Submit interactive settingPete Wyckoff1-78/+66
2012-05-17Merge branch 'ld/git-p4-tags-and-labels'Junio C Hamano1-3/+3