diff options
| author | Pete Wyckoff <pw@padd.com> | 2013-01-15 00:47:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-15 17:46:30 (GMT) |
| commit | 44e8d26cf3fbc0795fb1c44f54f458847313d35e (patch) | |
| tree | 1153c0cdd67ff3773642d01d9cc04db814fd4180 /Documentation/git-p4.txt | |
| parent | af8c0092503f677afc9ea4070ebd9204133b83ab (diff) | |
| download | git-44e8d26cf3fbc0795fb1c44f54f458847313d35e.zip git-44e8d26cf3fbc0795fb1c44f54f458847313d35e.tar.gz git-44e8d26cf3fbc0795fb1c44f54f458847313d35e.tar.bz2 | |
git p4: fix submit when no master branch
It finds its upstream and applies the commit properly, but
the sync step will fail unless it is told which branch to
work on.
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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index e79d046..f70ef9d 100644 --- 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. |