summaryrefslogtreecommitdiff
path: root/git-p4.py
AgeCommit message (Expand)AuthorFilesLines
2012-11-20Merge branch 'pw/maint-p4-rcs-expansion-newline'Libravatar Junio C Hamano1-1/+1
2012-11-08git p4: RCS expansion should not span newlinesLibravatar Pete Wyckoff1-1/+1
2012-09-18Merge branch 'pw/p4-submit-conflicts'Libravatar Junio C Hamano1-55/+184
2012-09-16git-p4: add submit --conflict option and config varaiableLibravatar Pete Wyckoff1-5/+31
2012-09-16git p4: add submit --prepare-p4-only optionLibravatar Pete Wyckoff1-0/+46
2012-09-16git p4: add submit --dry-run optionLibravatar Pete Wyckoff1-13/+30
2012-09-16git p4: accept -v for --verboseLibravatar Pete Wyckoff1-1/+1
2012-09-16git p4: revert deleted files after submit cancelLibravatar Pete Wyckoff1-0/+2
2012-09-16git p4: rearrange submit template constructionLibravatar Pete Wyckoff1-8/+21
2012-09-16git p4: test clean-up after failed submit, fix added filesLibravatar Pete Wyckoff1-2/+0
2012-09-16git p4: standardize submit cancel due to unchanged templateLibravatar Pete Wyckoff1-1/+3
2012-09-16git p4: move conflict prompt into run, add [q]uit inputLibravatar Pete Wyckoff1-12/+29
2012-09-16git p4: remove submit failure options [a]pply and [w]riteLibravatar Pete Wyckoff1-18/+2
2012-09-16git p4: gracefully fail if some commits could not be appliedLibravatar Pete Wyckoff1-9/+33
2012-08-20git p4: make branch detection work with --use-client-specLibravatar Pete Wyckoff1-6/+31
2012-08-11git p4: do wildcard decoding in stripRepoPathLibravatar Pete Wyckoff1-9/+8
2012-08-11git p4: set self.branchPrefixes in initializationLibravatar Pete Wyckoff1-11/+14
2012-07-15Merge branch 'pw/git-p4-move'Libravatar Junio C Hamano1-28/+58
2012-07-12git p4: add support for 'p4 move' in P4SubmitLibravatar Gary Gibbons1-8/+26
2012-07-05git p4: refactor diffOpts calculationLibravatar Gary Gibbons1-20/+32
2012-07-05git p4: notice Jobs lines in git commit messagesLibravatar Pete Wyckoff1-6/+40
2012-07-05git p4: remove unused P4Submit interactive settingLibravatar Pete Wyckoff1-78/+66
2012-05-17Merge branch 'ld/git-p4-tags-and-labels'Libravatar Junio C Hamano1-3/+3
2012-05-11git p4: fix bug when enabling tag import/export via config variablesLibravatar Luke Diamand1-2/+2
2012-05-11git p4: fix bug when verbose enabled with tag exportLibravatar Luke Diamand1-1/+1
2012-04-30git p4: submit files with wildcardsLibravatar Pete Wyckoff1-28/+46
2012-04-30git p4: fix writable file after rename or copyLibravatar Pete Wyckoff1-0/+12
2012-04-30git p4: bring back files in deleted client directoryLibravatar Pete Wyckoff1-3/+9
2012-04-24git p4: move verbose to base classLibravatar Luke Diamand1-21/+10
2012-04-24git p4: Ignore P4EDITOR if it is emptyLibravatar Luke Diamand1-1/+1
2012-04-24git p4: fix-up "import/export of labels to/from p4"Libravatar Luke Diamand1-13/+11
2012-04-11git p4: import/export of labels to/from p4Libravatar Luke Diamand1-34/+228
2012-04-09git p4: update name in scriptLibravatar Pete Wyckoff1-7/+7
2012-04-09git-p4: move to toplevelLibravatar Pete Wyckoff1-0/+2758