Skip to content

Commit a7a41fd

Browse files
committed
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 <[email protected]>
1 parent c60dc9d commit a7a41fd

File tree

1 file changed

+0
-26
lines changed

1 file changed

+0
-26
lines changed

Documentation/git-pull.adoc

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -35,32 +35,6 @@ There are 4 main options for integrating the remote branch:
3535
You can also set the configuration options `pull.rebase`, `pull.squash`,
3636
or `pull.ff` with your preferred behaviour.
3737

38-
Assume the following history exists and the current branch is
39-
"`master`":
40-
41-
------------
42-
A---B---C master on origin
43-
/
44-
D---E---F---G master
45-
^
46-
origin/master in your repository
47-
------------
48-
49-
Then "`git pull`" will fetch and replay the changes from the remote
50-
`master` branch since it diverged from the local `master` (i.e., `E`)
51-
until its current commit (`C`) on top of `master` and record the
52-
result in a new commit along with the names of the two parent commits
53-
and a log message from the user describing the changes.
54-
55-
------------
56-
A---B---C origin/master
57-
/ \
58-
D---E---F---G---H master
59-
------------
60-
61-
See linkgit:git-merge[1] for details, including how conflicts
62-
are presented and handled.
63-
6438
In Git 1.7.0 or later, to cancel a conflicting merge, use
6539
`git reset --merge`. *Warning*: In older versions of Git, running 'git pull'
6640
with uncommitted changes is discouraged: while possible, it leaves you

0 commit comments

Comments
 (0)