summaryrefslogtreecommitdiffstats
path: root/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-27 11:58:35 -0800
committerJunio C Hamano <gitster@pobox.com>2017-12-27 11:58:35 -0800
commit0f1291dcb49cd80bdb333eecb5f978a6a5ac3818 (patch)
treec8082d36556025d6bcea28f0b0afd313c809c34b /git-rebase.txt
parent047135e65db3686c7b168ba029e8545071e5226f (diff)
downloadgit-htmldocs-0f1291dcb49cd80bdb333eecb5f978a6a5ac3818.tar.gz
Autogenerated HTML docs for v2.15.1-501-g29533f
Diffstat (limited to 'git-rebase.txt')
-rw-r--r--git-rebase.txt19
1 files changed, 1 insertions, 18 deletions
diff --git a/git-rebase.txt b/git-rebase.txt
index 3cedfb0fd..8a861c1e0 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -203,24 +203,7 @@ Alternatively, you can undo the 'git rebase' with
CONFIGURATION
-------------
-rebase.stat::
- Whether to show a diffstat of what changed upstream since the last
- rebase. False by default.
-
-rebase.autoSquash::
- If set to true enable `--autosquash` option by default.
-
-rebase.autoStash::
- If set to true enable `--autostash` option by default.
-
-rebase.missingCommitsCheck::
- If set to "warn", print warnings about removed commits in
- interactive mode. If set to "error", print the warnings and
- stop the rebase. If set to "ignore", no checking is
- done. "ignore" by default.
-
-rebase.instructionFormat::
- Custom commit list format to use during an `--interactive` rebase.
+include::rebase-config.txt[]
OPTIONS
-------