Skip to content

Commit 3b3477e

Browse files
luked99gitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent f55b87c commit 3b3477e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Documentation/git-p4.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ These options can be used to modify 'git p4 submit' behavior.
342342

343343
--disable-rebase::
344344
Disable the automatic rebase after all commits have been successfully
345-
submitted.
345+
submitted. Can also be set with git-p4.disableRebase.
346346

347347
Rebase options
348348
~~~~~~~~~~~~~~
@@ -658,6 +658,9 @@ git-p4.conflict::
658658
Specify submit behavior when a conflict with p4 is found, as per
659659
--conflict. The default behavior is 'ask'.
660660

661+
git-p4.disableRebase::
662+
Do not rebase the tree against p4/master following a submit.
663+
661664
IMPLEMENTATION DETAILS
662665
----------------------
663666
* Changesets from p4 are imported using Git fast-import.

git-p4.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1368,7 +1368,7 @@ def __init__(self):
13681368
self.shelve = False
13691369
self.update_shelve = list()
13701370
self.commit = ""
1371-
self.disable_rebase = False
1371+
self.disable_rebase = gitConfigBool("git-p4.disableRebase")
13721372
self.prepare_p4_only = False
13731373
self.conflict_behavior = None
13741374
self.isWindows = (platform.system() == "Windows")

0 commit comments

Comments
 (0)