mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git p4: fix submit when no master branch

Browse Source 
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>
This commit is contained in:
Pete Wyckoff
2013-01-14 19:47:08 -05:00
committed by Junio C Hamano
parent af8c009250
commit 44e8d26cf3
3 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-p4.txt
View File

@ -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.