diff options
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 9a7cdea0f1..d7f5a51fea 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 |