git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
daa14f117027ac0c48f2dc4f6e918c352fb4db02 blob 1801 bytes (raw)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
 
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.
+
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[1] 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
mode.
+
*NOTE*: this is a possibly dangerous operation; do *not* use
it unless you understand the implications (see linkgit:git-rebase[1]
for details).

pull.mode::
	When "git pull" is run, this determines if it would either merge or
	rebase the fetched branch. The possible values are 'merge',
	'rebase', and 'ff-only'. See "branch.<name>.pullmode" for doing
	this in a non branch-specific manner.

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.
debug log:

solving daa14f1170 ...
found daa14f1170 in https://public-inbox.org/git/20201125032938.786393-10-felipe.contreras@gmail.com/
found 2606515fe4 in https://public-inbox.org/git/20201125032938.786393-9-felipe.contreras@gmail.com/
found 5404830609 in https://80x24.org/mirrors/git.git
preparing index
index prepared:
100644 5404830609569d78dbcd597847c86e4302123b75	Documentation/config/pull.txt

applying [1/2] https://public-inbox.org/git/20201125032938.786393-9-felipe.contreras@gmail.com/
diff --git a/Documentation/config/pull.txt b/Documentation/config/pull.txt
index 5404830609..2606515fe4 100644


applying [2/2] https://public-inbox.org/git/20201125032938.786393-10-felipe.contreras@gmail.com/
diff --git a/Documentation/config/pull.txt b/Documentation/config/pull.txt
index 2606515fe4..daa14f1170 100644

Checking patch Documentation/config/pull.txt...
Applied patch Documentation/config/pull.txt cleanly.
Checking patch Documentation/config/pull.txt...
Applied patch Documentation/config/pull.txt cleanly.

index at:
100644 daa14f117027ac0c48f2dc4f6e918c352fb4db02	Documentation/config/pull.txt

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

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).