doc: git-pull: delete the example
From user feedback: this example is confusing because it implies that `git pull` will run `git merge` by default, but the default is `--ff-only`. We could instead show an example of a fast-forward merge, but that may not add a lot since fast-forward merges are relatively simple. This lets us keep the description short. Signed-off-by: Julia Evans <julia@jvns.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Julia Evans committed
Oct 15, 2025 at 13:13 UTC
d8942ac494fb08b5b99a3eb6fb6a2853a0232d21
1 file changed
-26
Documentation/git-pull.adoc
-26
@@ -36,32 +36,6 @@ There are 4 main options for integrating the remote branch:
36
You can also set the configuration options `pull.rebase`, `pull.squash`,
37
or `pull.ff` with your preferred behaviour.
38
39
-Assume the following history exists and the current branch is
40
-"`master`":
41
-
42
-------------
43
- A---B---C master on origin
44
- /
45
- D---E---F---G master
46
- ^
47
- origin/master in your repository
48
-------------
49
-
50
-Then "`git pull`" will fetch and replay the changes from the remote
51
-`master` branch since it diverged from the local `master` (i.e., `E`)
52
-until its current commit (`C`) on top of `master` and record the
53
-result in a new commit along with the names of the two parent commits
54
-and a log message from the user describing the changes.
55
-
56
-------------
57
- A---B---C origin/master
58
- / \
59
- D---E---F---G---H master
60
-------------
61
-
62
-See linkgit:git-merge[1] for details, including how conflicts
63
-are presented and handled.
64
-
39
In Git 1.7.0 or later, to cancel a conflicting merge, use
40
`git reset --merge`. *Warning*: In older versions of Git, running 'git pull'
41
with uncommitted changes is discouraged: while possible, it leaves you