summaryrefslogtreecommitdiffstats
path: root/git-p4.py
diff options
context:
space:
mode:
authorLuke Diamand <luke@diamand.org>2018-06-08 22:32:43 +0200
committerJunio C Hamano <gitster@pobox.com>2018-06-12 23:46:08 +0200
commit3b3477ea5ae0a443ecceaf588c41cbc937066260 (patch)
tree66181c0905b089532435b72af13d0f125a81ec98 /git-p4.py
parentgit-p4: add options --commit and --disable-rebase (diff)
downloadgit-3b3477ea5ae0a443ecceaf588c41cbc937066260.tar.xz
git-3b3477ea5ae0a443ecceaf588c41cbc937066260.zip
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>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index f4a6f3b4c3..9b120bd35d 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -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")