blob: 9349e09261b25ce0d80b2543810fd4e8a3e08bf6 [file] [log] [blame]
Nguyễn Thái Ngọc Duy04750292018-08-22 18:06:00 +02001pull.ff::
2 By default, Git does not create an extra merge commit when merging
3 a commit that is a descendant of the current commit. Instead, the
4 tip of the current branch is fast-forwarded. When set to `false`,
5 this variable tells Git to create an extra merge commit in such
6 a case (equivalent to giving the `--no-ff` option from the command
7 line). When set to `only`, only such fast-forward merges are
8 allowed (equivalent to giving the `--ff-only` option from the
9 command line). This setting overrides `merge.ff` when pulling.
10
11pull.rebase::
12 When true, rebase branches on top of the fetched branch, instead
13 of merging the default branch from the default remote when "git
14 pull" is run. See "branch.<name>.rebase" for setting this on a
15 per-branch basis.
16+
Bert Wesarg88f85762020-01-27 08:04:27 +010017When `merges` (or just 'm'), pass the `--rebase-merges` option to 'git rebase'
Nguyễn Thái Ngọc Duy04750292018-08-22 18:06:00 +020018so that the local merge commits are included in the rebase (see
19linkgit:git-rebase[1] for details).
20+
Bert Wesarg88f85762020-01-27 08:04:27 +010021When the value is `interactive` (or just 'i'), the rebase is run in interactive
22mode.
Nguyễn Thái Ngọc Duy04750292018-08-22 18:06:00 +020023+
24*NOTE*: this is a possibly dangerous operation; do *not* use
25it unless you understand the implications (see linkgit:git-rebase[1]
26for details).
27
28pull.octopus::
29 The default merge strategy to use when pulling multiple branches
30 at once.
31
32pull.twohead::
33 The default merge strategy to use when pulling a single branch.