mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-04 05:26:13 +02:00
Code

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>
This commit is contained in:
Luke Diamand 2018-06-08 21:32:43 +01:00 committed by Junio C Hamano
parent f55b87c1c7
commit 3b3477ea5a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-p4.txt
View File

@ -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.

2
git-p4.py
View File

@ -1368,7 +1368,7 @@ def __init__(self):
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")