On Tue, Jun 5, 2018 at 4:29 AM Luke Diamand <l...@diamand.org> wrote:
> 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 <l...@diamand.org>
> ---
> diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
> @@ -369,6 +369,11 @@ These options can be used to modify 'git p4 submit'
> behavior.
> +--disable-p4sync::
> + Disable the automatic sync of p4/master from Perforce after commit have
s/commit/commits/
> + been submitted. Implies --disable-rebase. Can also be set with
> + git-p4.disableP4Sync. Sync with origin/master still goes ahead if
> possible.
> diff --git a/git-p4.py b/git-p4.py
> @@ -1368,7 +1368,9 @@ def __init__(self):
> + optparse.make_option("--disable-p4sync",
> dest="disable_p4sync", action="store_true",
> + help="Skip perforce sync of p4/master
> after submit or shelve"),
s/perforce/Perforce/
