Merge branch 'jc/no-git-config-in-clone'

diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index e79d0467c4d7125e2efeb9a489e57aee346c4a00..f70ef9ded2c7e476c60a90f15ef45e650c663bde 100644 (file)
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -294,6 +294,11 @@ These options can be used to modify 'git p4 submit' behavior.
        to bypass the prompt, causing conflicting commits to be automatically
        skipped, or to quit trying to apply commits, without prompting.
 
+--branch <branch>::
+       After submitting, sync this named branch instead of the default
+       p4/master.  See the "Sync options" section above for more
+       information.
+
 Rebase options
 ~~~~~~~~~~~~~~
 These options can be used to modify 'git p4 rebase' behavior.