path: root/Documentation
diff options
authorRomain Merland <>2018-06-01 07:46:14 (GMT)
committerJunio C Hamano <>2018-06-12 21:45:16 (GMT)
commitf55b87c1c748cdec7ce1631e6296e3edfd7cfc7d (patch)
tree51b21c9b89aa6b67822d22df31bad18579185496 /Documentation
parentccdcbd54c4475c2238b310f7113ab3075b5abc9c (diff)
git-p4: add options --commit and --disable-rebase
On a daily work with multiple local git branches, the usual way to submit only a specified commit was to cherry-pick the commit on master then run git-p4 submit. It can be very annoying to switch between local branches and master, only to submit one commit. The proposed new way is to select directly the commit you want to submit. Add option --commit to command 'git-p4 submit' in order to submit only specified commit(s) in p4. On a daily work developping software with big compilation time, one may not want to rebase on his local git tree, in order to avoid long recompilation. Add option --disable-rebase to command 'git-p4 submit' in order to disable rebase after submission. Thanks-to: Cedric Borgese <> Reviewed-by: Luke Diamand <> Signed-off-by: Romain Merland <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation')
1 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index d8c8f11..88d109d 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -149,6 +149,12 @@ To specify a branch other than the current one, use:
$ git p4 submit topicbranch
+To specify a single commit or a range of commits, use:
+$ git p4 submit --commit <sha1>
+$ git p4 submit --commit <sha1..sha1>
The upstream reference is generally 'refs/remotes/p4/master', but can
be overridden using the `--origin=` command-line option.
@@ -330,6 +336,14 @@ These options can be used to modify 'git p4 submit' behavior.
p4/master. See the "Sync options" section above for more
+--commit <sha1>|<sha1..sha1>::
+ Submit only the specified commit or range of commits, instead of the full
+ list of changes that are in the current Git branch.
+ Disable the automatic rebase after all commits have been successfully
+ submitted.
Rebase options
These options can be used to modify 'git p4 rebase' behavior.