diff options
author | Luke Diamand <luke@diamand.org> | 2018-06-08 22:32:43 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-06-12 23:46:08 +0200 |
commit | 3b3477ea5ae0a443ecceaf588c41cbc937066260 (patch) | |
tree | 66181c0905b089532435b72af13d0f125a81ec98 /git-p4.py | |
parent | git-p4: add options --commit and --disable-rebase (diff) | |
download | git-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-x | git-p4.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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") |