freshlybakedca.ke / git
Git fork
fork atom

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>

authored by

Julia Evans and committed by
Junio C Hamano d8942ac4 59b28f92

-26
unified split
-26
Documentation/git-pull.adoc
··· 36 36 You can also set the configuration options `pull.rebase`, `pull.squash`, 37 37 or `pull.ff` with your preferred behaviour. 38 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 - 65 39 In Git 1.7.0 or later, to cancel a conflicting merge, use 66 40 `git reset --merge`. *Warning*: In older versions of Git, running 'git pull' 67 41 with uncommitted changes is discouraged: while possible, it leaves you