2606515fe4788ef8fa319c41b8871997aeeab7c6 blob 1790 bytes (raw)
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.
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
When `merges` (or just 'm'), pass the `--rebase-merges` option to 'git rebase'
so that the local merge commits are included in the rebase (see
linkgit:git-rebase for details).
When `preserve` (or just 'p', deprecated in favor of `merges`), also pass
`--preserve-merges` along to 'git rebase' so that locally committed merge
commits will not be flattened by running 'git pull'.
When the value is `interactive` (or just 'i'), the rebase is run in interactive
*NOTE*: this is a possibly dangerous operation; do *not* use
it unless you understand the implications (see linkgit:git-rebase
When "git pull" is run, this determines if it would either merge or
rebase the fetched branch. The possible values are 'merge',
and 'rebase'. See "branch.<name>.pullmode" for doing
this in a non branch-specific manner.
The default merge strategy to use when pulling multiple branches
The default merge strategy to use when pulling a single branch.
solving 2606515fe4 ...
found 2606515fe4 in https://email@example.com/
found 5404830609 in https://80x24.org/mirrors/git.git
100644 5404830609569d78dbcd597847c86e4302123b75 Documentation/config/pull.txt
applying [1/1] https://firstname.lastname@example.org/
diff --git a/Documentation/config/pull.txt b/Documentation/config/pull.txt
index 5404830609..2606515fe4 100644
Checking patch Documentation/config/pull.txt...
Applied patch Documentation/config/pull.txt cleanly.
100644 2606515fe4788ef8fa319c41b8871997aeeab7c6 Documentation/config/pull.txt
Code repositories for project(s) associated with this inbox:
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).