mirror of
https://github.com/git/git.git
synced 2024-05-28 18:36:46 +02:00
9bcde4d531
Remove the rebase.useBuiltin setting and the now-obsolete GIT_TEST_REBASE_USE_BUILTIN test flag. This was left in place after myd03ebd411c(rebase: remove the rebase.useBuiltin setting, 2019-03-18) to help anyone who'd used the experimental flag and wanted to know that it was the default, or that they should transition their test environment to use the builtin rebase unconditionally. It's been more than long enough for those users to get a headsup about this. So remove all the scaffolding that was left inplace afterd03ebd411c. I'm also removing the documentation entry, if anyone still has this left in their configuration they can do some source archaeology to figure out what it used to do, which makes more sense than exposing every git user reading the documentation to this legacy configuration switch. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
67 lines
2.4 KiB
Plaintext
67 lines
2.4 KiB
Plaintext
rebase.backend::
|
|
Default backend to use for rebasing. Possible choices are
|
|
'apply' or 'merge'. In the future, if the merge backend gains
|
|
all remaining capabilities of the apply backend, this setting
|
|
may become unused.
|
|
|
|
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::
|
|
When set to true, automatically create a temporary stash entry
|
|
before the operation begins, and apply it after the operation
|
|
ends. This means that you can run rebase on a dirty worktree.
|
|
However, use with care: the final stash application after a
|
|
successful rebase might result in non-trivial conflicts.
|
|
This option can be overridden by the `--no-autostash` and
|
|
`--autostash` options of linkgit:git-rebase[1].
|
|
Defaults to false.
|
|
|
|
rebase.missingCommitsCheck::
|
|
If set to "warn", git rebase -i will print a warning if some
|
|
commits are removed (e.g. a line was deleted), however the
|
|
rebase will still proceed. If set to "error", it will print
|
|
the previous warning and stop the rebase, 'git rebase
|
|
--edit-todo' can then be used to correct the error. If set to
|
|
"ignore", no checking is done.
|
|
To drop a commit without warning or error, use the `drop`
|
|
command in the todo list.
|
|
Defaults to "ignore".
|
|
|
|
rebase.instructionFormat::
|
|
A format string, as specified in linkgit:git-log[1], to be used for the
|
|
todo list during an interactive rebase. The format will
|
|
automatically have the long commit hash prepended to the format.
|
|
|
|
rebase.abbreviateCommands::
|
|
If set to true, `git rebase` will use abbreviated command names in the
|
|
todo list resulting in something like this:
|
|
+
|
|
-------------------------------------------
|
|
p deadbee The oneline of the commit
|
|
p fa1afe1 The oneline of the next commit
|
|
...
|
|
-------------------------------------------
|
|
+
|
|
instead of:
|
|
+
|
|
-------------------------------------------
|
|
pick deadbee The oneline of the commit
|
|
pick fa1afe1 The oneline of the next commit
|
|
...
|
|
-------------------------------------------
|
|
+
|
|
Defaults to false.
|
|
|
|
rebase.rescheduleFailedExec::
|
|
Automatically reschedule `exec` commands that failed. This only makes
|
|
sense in interactive mode (or when an `--exec` option was provided).
|
|
This is the same as specifying the `--reschedule-failed-exec` option.
|
|
|
|
rebase.forkPoint::
|
|
If set to false set `--no-fork-point` option by default.
|