]> git.ipfire.org Git - thirdparty/git.git/blame - Documentation/config/rebase.txt
Merge branch 'jk/clone-allow-bare-and-o-together'
[thirdparty/git.git] / Documentation / config / rebase.txt
CommitLineData
8295ed69
EN
1rebase.backend::
2 Default backend to use for rebasing. Possible choices are
10cdb9f3
EN
3 'apply' or 'merge'. In the future, if the merge backend gains
4 all remaining capabilities of the apply backend, this setting
5 may become unused.
8295ed69 6
946a9f20
LB
7rebase.stat::
8 Whether to show a diffstat of what changed upstream since the last
9 rebase. False by default.
10
11rebase.autoSquash::
12 If set to true enable `--autosquash` option by default.
13
14rebase.autoStash::
15 When set to true, automatically create a temporary stash entry
16 before the operation begins, and apply it after the operation
17 ends. This means that you can run rebase on a dirty worktree.
18 However, use with care: the final stash application after a
19 successful rebase might result in non-trivial conflicts.
20 This option can be overridden by the `--no-autostash` and
21 `--autostash` options of linkgit:git-rebase[1].
22 Defaults to false.
23
3113feda
DS
24rebase.updateRefs::
25 If set to true enable `--update-refs` option by default.
26
946a9f20
LB
27rebase.missingCommitsCheck::
28 If set to "warn", git rebase -i will print a warning if some
29 commits are removed (e.g. a line was deleted), however the
30 rebase will still proceed. If set to "error", it will print
31 the previous warning and stop the rebase, 'git rebase
32 --edit-todo' can then be used to correct the error. If set to
33 "ignore", no checking is done.
34 To drop a commit without warning or error, use the `drop`
f3b633da 35 command in the todo list.
946a9f20
LB
36 Defaults to "ignore".
37
38rebase.instructionFormat::
39 A format string, as specified in linkgit:git-log[1], to be used for the
f3b633da 40 todo list during an interactive rebase. The format will
946a9f20 41 automatically have the long commit hash prepended to the format.
d8ae6c84
LB
42
43rebase.abbreviateCommands::
44 If set to true, `git rebase` will use abbreviated command names in the
45 todo list resulting in something like this:
46+
47-------------------------------------------
48 p deadbee The oneline of the commit
49 p fa1afe1 The oneline of the next commit
50 ...
51-------------------------------------------
52+
53instead of:
54+
55-------------------------------------------
56 pick deadbee The oneline of the commit
57 pick fa1afe1 The oneline of the next commit
58 ...
59-------------------------------------------
60+
61Defaults to false.
969de3ff
JS
62
63rebase.rescheduleFailedExec::
64 Automatically reschedule `exec` commands that failed. This only makes
65 sense in interactive mode (or when an `--exec` option was provided).
66 This is the same as specifying the `--reschedule-failed-exec` option.
2803d800
AH
67
68rebase.forkPoint::
69 If set to false set `--no-fork-point` option by default.