2020-01-12 00:36:56 +01:00
|
|
|
pull.ff::
|
|
|
|
|
By default, Git does not create an extra merge commit when merging
|
|
|
|
|
a commit that is a descendant of the current commit. Instead, the
|
|
|
|
|
tip of the current branch is fast-forwarded. When set to `false`,
|
|
|
|
|
this variable tells Git to create an extra merge commit in such
|
|
|
|
|
a case (equivalent to giving the `--no-ff` option from the command
|
|
|
|
|
line). When set to `only`, only such fast-forward merges are
|
|
|
|
|
allowed (equivalent to giving the `--ff-only` option from the
|
|
|
|
|
command line). This setting overrides `merge.ff` when pulling.
|
|
|
|
|
|
|
|
|
|
pull.rebase::
|
|
|
|
|
When true, rebase branches on top of the fetched branch, instead
|
|
|
|
|
of merging the default branch from the default remote when "git
|
|
|
|
|
pull" is run. See "branch.<name>.rebase" for setting this on a
|
|
|
|
|
per-branch basis.
|
|
|
|
|
+
|
2020-05-26 01:06:52 +02:00
|
|
|
When `merges`, pass the `--rebase-merges` option to 'git rebase'
|
2020-01-12 00:36:56 +01:00
|
|
|
so that the local merge commits are included in the rebase (see
|
|
|
|
|
linkgit:git-rebase[1] for details).
|
|
|
|
|
+
|
2020-05-26 01:06:52 +02:00
|
|
|
When `preserve` (deprecated in favor of `merges`), also pass
|
2020-01-12 00:36:56 +01:00
|
|
|
`--preserve-merges` along to 'git rebase' so that locally committed merge
|
|
|
|
|
commits will not be flattened by running 'git pull'.
|
|
|
|
|
+
|
2020-05-26 01:06:52 +02:00
|
|
|
When the value is `interactive`, the rebase is run in interactive mode.
|
2020-01-12 00:36:56 +01:00
|
|
|
+
|
|
|
|
|
*NOTE*: this is a possibly dangerous operation; do *not* use
|
|
|
|
|
it unless you understand the implications (see linkgit:git-rebase[1]
|
|
|
|
|
for details).
|
|
|
|
|
|
|
|
|
|
pull.octopus::
|
|
|
|
|
The default merge strategy to use when pulling multiple branches
|
|
|
|
|
at once.
|
|
|
|
|
|
|
|
|
|
pull.twohead::
|
|
|
|
|
The default merge strategy to use when pulling a single branch.
|
