diff options
| author |  Luke Diamand <luke@diamand.org> | 2018-06-08 21:32:43 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-06-12 14:46:08 -0700 |
| commit | 3b3477ea5ae0a443ecceaf588c41cbc937066260 (patch) | |
| tree | 66181c0905b089532435b72af13d0f125a81ec98 /Documentation | |
| parent | git-p4: add options --commit and --disable-rebase (diff) | |
| download | tgif-3b3477ea5ae0a443ecceaf588c41cbc937066260.tar.xz | |
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 'Documentation')
| -rw-r--r-- | Documentation/git-p4.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 88d109debb..699fcc8f8a 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -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. |