git-p4: disable-rebase: allow setting this via configuration
This just lets you set the --disable-rebase option with the git configuration options git-p4.disableRebase. If you're using this option, you probably want to set it all the time for a given repo. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Luke Diamand committed
Jun 8, 2018 at 21:32 UTC
3b3477ea5ae0a443ecceaf588c41cbc937066260
2 files changed
+5
-2
Documentation/git-p4.txt
+4
-1
@@ -342,7 +342,7 @@ These options can be used to modify 'git p4 submit' behavior.
342
343
--disable-rebase::
344
Disable the automatic rebase after all commits have been successfully
345
- submitted.
345
+ submitted. Can also be set with git-p4.disableRebase.
346
347
Rebase options
348
~~~~~~~~~~~~~~
@@ -658,6 +658,9 @@ git-p4.conflict::
658
Specify submit behavior when a conflict with p4 is found, as per
659
--conflict. The default behavior is 'ask'.
660
661
+git-p4.disableRebase::
662
+ Do not rebase the tree against p4/master following a submit.
663
+
664
IMPLEMENTATION DETAILS
665
----------------------
666
* Changesets from p4 are imported using Git fast-import.
git-p4.py
+1
-1
@@ -1368,7 +1368,7 @@ class P4Submit(Command, P4UserMap):
1368
self.shelve = False
1369
self.update_shelve = list()
1370
self.commit = ""
1371
- self.disable_rebase = False
1371
+ self.disable_rebase = gitConfigBool("git-p4.disableRebase")
1372
self.prepare_p4_only = False
1373
self.conflict_behavior = None
1374
self.isWindows = (platform.system() == "Windows")