]> git.ipfire.org Git - thirdparty/git.git/blob - Documentation/config/rebase.txt
clone: allow "--bare" with "-o"
[thirdparty/git.git] / Documentation / config / rebase.txt
1 rebase.backend::
2 Default backend to use for rebasing. Possible choices are
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.
6
7 rebase.stat::
8 Whether to show a diffstat of what changed upstream since the last
9 rebase. False by default.
10
11 rebase.autoSquash::
12 If set to true enable `--autosquash` option by default.
13
14 rebase.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
24 rebase.missingCommitsCheck::
25 If set to "warn", git rebase -i will print a warning if some
26 commits are removed (e.g. a line was deleted), however the
27 rebase will still proceed. If set to "error", it will print
28 the previous warning and stop the rebase, 'git rebase
29 --edit-todo' can then be used to correct the error. If set to
30 "ignore", no checking is done.
31 To drop a commit without warning or error, use the `drop`
32 command in the todo list.
33 Defaults to "ignore".
34
35 rebase.instructionFormat::
36 A format string, as specified in linkgit:git-log[1], to be used for the
37 todo list during an interactive rebase. The format will
38 automatically have the long commit hash prepended to the format.
39
40 rebase.abbreviateCommands::
41 If set to true, `git rebase` will use abbreviated command names in the
42 todo list resulting in something like this:
43 +
44 -------------------------------------------
45 p deadbee The oneline of the commit
46 p fa1afe1 The oneline of the next commit
47 ...
48 -------------------------------------------
49 +
50 instead of:
51 +
52 -------------------------------------------
53 pick deadbee The oneline of the commit
54 pick fa1afe1 The oneline of the next commit
55 ...
56 -------------------------------------------
57 +
58 Defaults to false.
59
60 rebase.rescheduleFailedExec::
61 Automatically reschedule `exec` commands that failed. This only makes
62 sense in interactive mode (or when an `--exec` option was provided).
63 This is the same as specifying the `--reschedule-failed-exec` option.
64
65 rebase.forkPoint::
66 If set to false set `--no-fork-point` option by default.