| Commit message (Expand) | Author | Age | Files | Lines |
* | git p4: remove unneeded cmd initialization | Pete Wyckoff | 2012-11-26 | 1 | -1/+0 |
* | git p4: fix labelDetails typo in exception | Pete Wyckoff | 2012-11-26 | 1 | -1/+1 |
* | git p4: catch p4 errors when streaming file contents | Pete Wyckoff | 2012-11-26 | 1 | -7/+31 |
* | git p4: handle servers without move support | Pete Wyckoff | 2012-11-26 | 1 | -1/+20 |
* | git p4: catch p4 describe errors | Pete Wyckoff | 2012-11-26 | 1 | -9/+26 |
* | Merge branch 'pw/maint-p4-rcs-expansion-newline' | Junio C Hamano | 2012-11-20 | 1 | -1/+1 |
|\ |
|
| * | git p4: RCS expansion should not span newlines | Pete Wyckoff | 2012-11-08 | 1 | -1/+1 |
* | | Merge branch 'pw/p4-submit-conflicts' | Junio C Hamano | 2012-09-18 | 1 | -55/+184 |
|\ \ |
|
| * | | git-p4: add submit --conflict option and config varaiable | Pete Wyckoff | 2012-09-16 | 1 | -5/+31 |
| * | | git p4: add submit --prepare-p4-only option | Pete Wyckoff | 2012-09-16 | 1 | -0/+46 |
| * | | git p4: add submit --dry-run option | Pete Wyckoff | 2012-09-16 | 1 | -13/+30 |
| * | | git p4: accept -v for --verbose | Pete Wyckoff | 2012-09-16 | 1 | -1/+1 |
| * | | git p4: revert deleted files after submit cancel | Pete Wyckoff | 2012-09-16 | 1 | -0/+2 |
| * | | git p4: rearrange submit template construction | Pete Wyckoff | 2012-09-16 | 1 | -8/+21 |
| * | | git p4: test clean-up after failed submit, fix added files | Pete Wyckoff | 2012-09-16 | 1 | -2/+0 |
| * | | git p4: standardize submit cancel due to unchanged template | Pete Wyckoff | 2012-09-16 | 1 | -1/+3 |
| * | | git p4: move conflict prompt into run, add [q]uit input | Pete Wyckoff | 2012-09-16 | 1 | -12/+29 |
| * | | git p4: remove submit failure options [a]pply and [w]rite | Pete Wyckoff | 2012-09-16 | 1 | -18/+2 |
| * | | git p4: gracefully fail if some commits could not be applied | Pete Wyckoff | 2012-09-16 | 1 | -9/+33 |
| |/ |
|
* | | git p4: make branch detection work with --use-client-spec | Pete Wyckoff | 2012-08-20 | 1 | -6/+31 |
* | | git p4: do wildcard decoding in stripRepoPath | Pete Wyckoff | 2012-08-11 | 1 | -9/+8 |
* | | git p4: set self.branchPrefixes in initialization | Pete Wyckoff | 2012-08-11 | 1 | -11/+14 |
|/ |
|
* | Merge branch 'pw/git-p4-move' | Junio C Hamano | 2012-07-15 | 1 | -28/+58 |
|\ |
|
| * | git p4: add support for 'p4 move' in P4Submit | Gary Gibbons | 2012-07-12 | 1 | -8/+26 |
| * | git p4: refactor diffOpts calculation | Gary Gibbons | 2012-07-05 | 1 | -20/+32 |
* | | git p4: notice Jobs lines in git commit messages | Pete Wyckoff | 2012-07-05 | 1 | -6/+40 |
* | | git p4: remove unused P4Submit interactive setting | Pete Wyckoff | 2012-07-05 | 1 | -78/+66 |
|/ |
|
* | Merge branch 'ld/git-p4-tags-and-labels' | Junio C Hamano | 2012-05-17 | 1 | -3/+3 |
|\ |
|
| * | git p4: fix bug when enabling tag import/export via config variables | Luke Diamand | 2012-05-11 | 1 | -2/+2 |
| * | git p4: fix bug when verbose enabled with tag export | Luke Diamand | 2012-05-11 | 1 | -1/+1 |
* | | git p4: submit files with wildcards | Pete Wyckoff | 2012-04-30 | 1 | -28/+46 |
* | | git p4: fix writable file after rename or copy | Pete Wyckoff | 2012-04-30 | 1 | -0/+12 |
* | | git p4: bring back files in deleted client directory | Pete Wyckoff | 2012-04-30 | 1 | -3/+9 |
|/ |
|
* | git p4: move verbose to base class | Luke Diamand | 2012-04-24 | 1 | -21/+10 |
* | git p4: Ignore P4EDITOR if it is empty | Luke Diamand | 2012-04-24 | 1 | -1/+1 |
* | git p4: fix-up "import/export of labels to/from p4" | Luke Diamand | 2012-04-24 | 1 | -13/+11 |
* | git p4: import/export of labels to/from p4 | Luke Diamand | 2012-04-11 | 1 | -34/+228 |
* | git p4: update name in script | Pete Wyckoff | 2012-04-09 | 1 | -7/+7 |
* | git-p4: move to toplevel | Pete Wyckoff | 2012-04-09 | 1 | -0/+2758 |