summaryrefslogtreecommitdiff
path: root/git-p4.py
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'pw/p4-submit-conflicts'Junio C Hamano2012-09-181-55/+184
|\ \
| * | git-p4: add submit --conflict option and config varaiablePete Wyckoff2012-09-161-5/+31
| * | git p4: add submit --prepare-p4-only optionPete Wyckoff2012-09-161-0/+46
| * | git p4: add submit --dry-run optionPete Wyckoff2012-09-161-13/+30
| * | git p4: accept -v for --verbosePete Wyckoff2012-09-161-1/+1
| * | git p4: revert deleted files after submit cancelPete Wyckoff2012-09-161-0/+2
| * | git p4: rearrange submit template constructionPete Wyckoff2012-09-161-8/+21
| * | git p4: test clean-up after failed submit, fix added filesPete Wyckoff2012-09-161-2/+0
| * | git p4: standardize submit cancel due to unchanged templatePete Wyckoff2012-09-161-1/+3
| * | git p4: move conflict prompt into run, add [q]uit inputPete Wyckoff2012-09-161-12/+29
| * | git p4: remove submit failure options [a]pply and [w]ritePete Wyckoff2012-09-161-18/+2
| * | git p4: gracefully fail if some commits could not be appliedPete Wyckoff2012-09-161-9/+33
| |/
* | git p4: make branch detection work with --use-client-specPete Wyckoff2012-08-201-6/+31
* | git p4: do wildcard decoding in stripRepoPathPete Wyckoff2012-08-111-9/+8
* | git p4: set self.branchPrefixes in initializationPete Wyckoff2012-08-111-11/+14
|/
* Merge branch 'pw/git-p4-move'Junio C Hamano2012-07-151-28/+58
|\
| * git p4: add support for 'p4 move' in P4SubmitGary Gibbons2012-07-121-8/+26
| * git p4: refactor diffOpts calculationGary Gibbons2012-07-051-20/+32
* | git p4: notice Jobs lines in git commit messagesPete Wyckoff2012-07-051-6/+40
* | git p4: remove unused P4Submit interactive settingPete Wyckoff2012-07-051-78/+66
|/
* Merge branch 'ld/git-p4-tags-and-labels'Junio C Hamano2012-05-171-3/+3
|\
| * git p4: fix bug when enabling tag import/export via config variablesLuke Diamand2012-05-111-2/+2
| * git p4: fix bug when verbose enabled with tag exportLuke Diamand2012-05-111-1/+1
* | git p4: submit files with wildcardsPete Wyckoff2012-04-301-28/+46
* | git p4: fix writable file after rename or copyPete Wyckoff2012-04-301-0/+12
* | git p4: bring back files in deleted client directoryPete Wyckoff2012-04-301-3/+9
|/
* git p4: move verbose to base classLuke Diamand2012-04-241-21/+10
* git p4: Ignore P4EDITOR if it is emptyLuke Diamand2012-04-241-1/+1
* git p4: fix-up "import/export of labels to/from p4"Luke Diamand2012-04-241-13/+11
* git p4: import/export of labels to/from p4Luke Diamand2012-04-111-34/+228
* git p4: update name in scriptPete Wyckoff2012-04-091-7/+7
* git-p4: move to toplevelPete Wyckoff2012-04-091-0/+2758
View Lorry Controller Status