aboutsummaryrefslogtreecommitdiff
path: root/git-p4.py
Commit message (Expand)AuthorAge
* Merge branch 'pw/p4-branch-fixes'Junio C Hamano2013-01-21
|\
| * git p4: fix submit when no master branchPete Wyckoff2013-01-15
| * git p4: fix sync --branch when no master branchPete Wyckoff2013-01-15
| * git p4: fail gracefully on sync with no master branchPete Wyckoff2013-01-15
| * git p4: rearrange self.initialParent usePete Wyckoff2013-01-15
| * git p4: allow short ref names to --branchPete Wyckoff2013-01-15
| * git p4: clone --branch should checkout masterPete Wyckoff2013-01-15
| * git p4: create p4/HEAD on initial clonePete Wyckoff2013-01-15
| * git p4: inline listExistingP4GitBranchesPete Wyckoff2013-01-15
| * git p4: add comments to p4BranchesInGitPete Wyckoff2013-01-15
| * git p4: rearrange and simplify hasOrigin handlingPete Wyckoff2013-01-15
* | Add checks to Python scripts for version dependencies.Eric S. Raymond2012-12-28
|/
* git p4: remove unneeded cmd initializationPete Wyckoff2012-11-26
* git p4: fix labelDetails typo in exceptionPete Wyckoff2012-11-26
* git p4: catch p4 errors when streaming file contentsPete Wyckoff2012-11-26
* git p4: handle servers without move supportPete Wyckoff2012-11-26
* git p4: catch p4 describe errorsPete Wyckoff2012-11-26
* Merge branch 'pw/maint-p4-rcs-expansion-newline'Junio C Hamano2012-11-20
|\
| * git p4: RCS expansion should not span newlinesPete Wyckoff2012-11-08
* | Merge branch 'pw/p4-submit-conflicts'Junio C Hamano2012-09-18
|\ \
| * | git-p4: add submit --conflict option and config varaiablePete Wyckoff2012-09-16
| * | git p4: add submit --prepare-p4-only optionPete Wyckoff2012-09-16
| * | git p4: add submit --dry-run optionPete Wyckoff2012-09-16
| * | git p4: accept -v for --verbosePete Wyckoff2012-09-16
| * | git p4: revert deleted files after submit cancelPete Wyckoff2012-09-16
| * | git p4: rearrange submit template constructionPete Wyckoff2012-09-16
| * | git p4: test clean-up after failed submit, fix added filesPete Wyckoff2012-09-16
| * | git p4: standardize submit cancel due to unchanged templatePete Wyckoff2012-09-16
| * | git p4: move conflict prompt into run, add [q]uit inputPete Wyckoff2012-09-16
| * | git p4: remove submit failure options [a]pply and [w]ritePete Wyckoff2012-09-16
| * | git p4: gracefully fail if some commits could not be appliedPete Wyckoff2012-09-16
| |/
* | git p4: make branch detection work with --use-client-specPete Wyckoff2012-08-20
* | git p4: do wildcard decoding in stripRepoPathPete Wyckoff2012-08-11
* | git p4: set self.branchPrefixes in initializationPete Wyckoff2012-08-11
|/
* Merge branch 'pw/git-p4-move'Junio C Hamano2012-07-15
|\
| * git p4: add support for 'p4 move' in P4SubmitGary Gibbons2012-07-12
| * git p4: refactor diffOpts calculationGary Gibbons2012-07-05
* | git p4: notice Jobs lines in git commit messagesPete Wyckoff2012-07-05
* | git p4: remove unused P4Submit interactive settingPete Wyckoff2012-07-05
|/
* Merge branch 'ld/git-p4-tags-and-labels'Junio C Hamano2012-05-17
|\
| * git p4: fix bug when enabling tag import/export via config variablesLuke Diamand2012-05-11
| * git p4: fix bug when verbose enabled with tag exportLuke Diamand2012-05-11
* | git p4: submit files with wildcardsPete Wyckoff2012-04-30
* | git p4: fix writable file after rename or copyPete Wyckoff2012-04-30
* | git p4: bring back files in deleted client directoryPete Wyckoff2012-04-30
|/
* git p4: move verbose to base classLuke Diamand2012-04-24
* git p4: Ignore P4EDITOR if it is emptyLuke Diamand2012-04-24
* git p4: fix-up "import/export of labels to/from p4"Luke Diamand2012-04-24
* git p4: import/export of labels to/from p4Luke Diamand2012-04-11
* git p4: update name in scriptPete Wyckoff2012-04-09