summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLuke Diamand <luke@diamand.org>2018-06-08 20:32:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-12 21:46:08 (GMT)
commitb9d34db9a2108755ad01926cccc2a5007b5862a6 (patch)
tree14df8c21ce57cd7255d21b5873750814ef84f8af /Documentation
parent3b3477ea5ae0a443ecceaf588c41cbc937066260 (diff)
downloadgit-b9d34db9a2108755ad01926cccc2a5007b5862a6.zip
git-b9d34db9a2108755ad01926cccc2a5007b5862a6.tar.gz
git-b9d34db9a2108755ad01926cccc2a5007b5862a6.tar.bz2
git-p4: add option to disable syncing of p4/master with p4
Add an option to the git-p4 submit command to disable syncing with Perforce. This is useful for the case where a git-p4 mirror has been setup on a server somewhere, running from (e.g.) cron, and developers then clone from this. Having the local cloned copy also sync from Perforce just isn't useful. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-p4.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 699fcc8..fa0e992 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -344,6 +344,11 @@ These options can be used to modify 'git p4 submit' behavior.
Disable the automatic rebase after all commits have been successfully
submitted. Can also be set with git-p4.disableRebase.
+--disable-p4sync::
+ Disable the automatic sync of p4/master from Perforce after commits have
+ been submitted. Implies --disable-rebase. Can also be set with
+ git-p4.disableP4Sync. Sync with origin/master still goes ahead if possible.
+
Rebase options
~~~~~~~~~~~~~~
These options can be used to modify 'git p4 rebase' behavior.
@@ -661,6 +666,9 @@ git-p4.conflict::
git-p4.disableRebase::
Do not rebase the tree against p4/master following a submit.
+git-p4.disableP4Sync::
+ Do not sync p4/master with Perforce following a submit. Implies git-p4.disableRebase.
+
IMPLEMENTATION DETAILS
----------------------
* Changesets from p4 are imported using Git fast-import.