diff options
| -rw-r--r-- | Documentation/git-p4.txt | 5 | ||||
| -rwxr-xr-x | git-p4.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 88d109debb..699fcc8f8a 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -342,7 +342,7 @@ These options can be used to modify 'git p4 submit' behavior. --disable-rebase:: Disable the automatic rebase after all commits have been successfully - submitted. + submitted. Can also be set with git-p4.disableRebase. Rebase options ~~~~~~~~~~~~~~ @@ -658,6 +658,9 @@ git-p4.conflict:: Specify submit behavior when a conflict with p4 is found, as per --conflict. The default behavior is 'ask'. +git-p4.disableRebase:: + Do not rebase the tree against p4/master following a submit. + IMPLEMENTATION DETAILS ---------------------- * Changesets from p4 are imported using Git fast-import. @@ -1368,7 +1368,7 @@ class P4Submit(Command, P4UserMap): self.shelve = False self.update_shelve = list() self.commit = "" - self.disable_rebase = False + self.disable_rebase = gitConfigBool("git-p4.disableRebase") self.prepare_p4_only = False self.conflict_behavior = None self.isWindows = (platform.system() == "Windows") |