]> git.ipfire.org Git - thirdparty/git.git/blob - Documentation/rebase-config.txt
Merge branch 'jk/use-compat-util-in-test-tool'
[thirdparty/git.git] / Documentation / rebase-config.txt
1 rebase.stat::
2 Whether to show a diffstat of what changed upstream since the last
3 rebase. False by default.
4
5 rebase.autoSquash::
6 If set to true enable `--autosquash` option by default.
7
8 rebase.autoStash::
9 When set to true, automatically create a temporary stash entry
10 before the operation begins, and apply it after the operation
11 ends. This means that you can run rebase on a dirty worktree.
12 However, use with care: the final stash application after a
13 successful rebase might result in non-trivial conflicts.
14 This option can be overridden by the `--no-autostash` and
15 `--autostash` options of linkgit:git-rebase[1].
16 Defaults to false.
17
18 rebase.missingCommitsCheck::
19 If set to "warn", git rebase -i will print a warning if some
20 commits are removed (e.g. a line was deleted), however the
21 rebase will still proceed. If set to "error", it will print
22 the previous warning and stop the rebase, 'git rebase
23 --edit-todo' can then be used to correct the error. If set to
24 "ignore", no checking is done.
25 To drop a commit without warning or error, use the `drop`
26 command in the todo list.
27 Defaults to "ignore".
28
29 rebase.instructionFormat::
30 A format string, as specified in linkgit:git-log[1], to be used for the
31 todo list during an interactive rebase. The format will
32 automatically have the long commit hash prepended to the format.
33
34 rebase.abbreviateCommands::
35 If set to true, `git rebase` will use abbreviated command names in the
36 todo list resulting in something like this:
37 +
38 -------------------------------------------
39 p deadbee The oneline of the commit
40 p fa1afe1 The oneline of the next commit
41 ...
42 -------------------------------------------
43 +
44 instead of:
45 +
46 -------------------------------------------
47 pick deadbee The oneline of the commit
48 pick fa1afe1 The oneline of the next commit
49 ...
50 -------------------------------------------
51 +
52 Defaults to false.