diff options
| author | Pete Wyckoff <pw@padd.com> | 2011-12-25 02:07:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-27 18:19:31 (GMT) |
| commit | 28755dbaa5213032b2da202652c214a9f94ff853 (patch) | |
| tree | 68af619b99ccd56db44d4800fc2528b8812932aa /Documentation/git-p4.txt | |
| parent | 09fca77b9ecd64e2008835208bab29e15a4b2809 (diff) | |
| download | git-28755dbaa5213032b2da202652c214a9f94ff853.zip git-28755dbaa5213032b2da202652c214a9f94ff853.tar.gz git-28755dbaa5213032b2da202652c214a9f94ff853.tar.bz2 | |
git-p4: document and test submit options
Clarify there is a -M option, but no -C. These are both
configurable through variables.
Explain that the allowSubmit variable takes a comma-separated
list of branch names.
Catch earlier an invalid branch name given as an argument to
"git p4 clone".
Test option --origin, variable allowSubmit, and explicit master
branch name.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-p4.txt')
| -rw-r--r-- | Documentation/git-p4.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 9a7cdea..d7f5a51 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -267,7 +267,9 @@ These options can be used to modify 'git p4 submit' behavior. -M[<n>]:: Detect renames. See linkgit:git-diff[1]. Renames will be - represented in p4 using explicit 'move' operations. + represented in p4 using explicit 'move' operations. There + is no corresponding option to detect copies, but there are + variables for both moves and copies. --preserve-user:: Re-author p4 changes before submitting to p4. This option @@ -453,7 +455,9 @@ git-p4.skipSubmitEditCheck:: git-p4.allowSubmit:: By default, any branch can be used as the source for a 'git p4 submit' operation. This configuration variable, if set, permits only - the named branches to be used as submit sources. + the named branches to be used as submit sources. Branch names + must be the short names (no "refs/heads/"), and should be + separated by commas (","), with no spaces. git-p4.skipUserNameCheck:: If the user running 'git p4 submit' does not exist in the p4 |