summaryrefslogtreecommitdiffstats
path: root/git-p4.py
AgeCommit message (Expand)AuthorLines
2012-11-28Merge branch 'pw/maint-p4-rcs-expansion-newline' into maintJunio 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
2012-08-11git p4: do wildcard decoding in stripRepoPathPete Wyckoff-9/+8
2012-08-11git p4: set self.branchPrefixes in initializationPete Wyckoff-11/+14
2012-07-15Merge branch 'pw/git-p4-move'Junio C Hamano-28/+58
2012-07-12git p4: add support for 'p4 move' in P4SubmitGary Gibbons-8/+26
2012-07-05git p4: refactor diffOpts calculationGary Gibbons-20/+32
2012-07-05git p4: notice Jobs lines in git commit messagesPete Wyckoff-6/+40
2012-07-05git p4: remove unused P4Submit interactive settingPete Wyckoff-78/+66
2012-05-17Merge branch 'ld/git-p4-tags-and-labels'Junio C Hamano-3/+3
2012-05-11git p4: fix bug when enabling tag import/export via config variablesLuke Diamand-2/+2
2012-05-11git p4: fix bug when verbose enabled with tag exportLuke Diamand-1/+1
2012-04-30git p4: submit files with wildcardsPete Wyckoff-28/+46
2012-04-30git p4: fix writable file after rename or copyPete Wyckoff-0/+12
2012-04-30git p4: bring back files in deleted client directoryPete Wyckoff-3/+9
2012-04-24git p4: move verbose to base classLuke Diamand-21/+10
2012-04-24git p4: Ignore P4EDITOR if it is emptyLuke Diamand-1/+1
2012-04-24git p4: fix-up "import/export of labels to/from p4"Luke Diamand-13/+11
2012-04-11git p4: import/export of labels to/from p4Luke Diamand-34/+228
2012-04-09git p4: update name in scriptPete Wyckoff-7/+7
2012-04-09git-p4: move to toplevelPete Wyckoff-0/+2758