diff options
| -rw-r--r-- | Documentation/git-pull.adoc | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/Documentation/git-pull.adoc b/Documentation/git-pull.adoc index 0686a9d666..273172aa80 100644 --- a/Documentation/git-pull.adoc +++ b/Documentation/git-pull.adoc @@ -36,32 +36,6 @@ There are 4 main options for integrating the remote branch: You can also set the configuration options `pull.rebase`, `pull.squash`, or `pull.ff` with your preferred behaviour. -Assume the following history exists and the current branch is -"`master`": - ------------- - A---B---C master on origin - / - D---E---F---G master - ^ - origin/master in your repository ------------- - -Then "`git pull`" will fetch and replay the changes from the remote -`master` branch since it diverged from the local `master` (i.e., `E`) -until its current commit (`C`) on top of `master` and record the -result in a new commit along with the names of the two parent commits -and a log message from the user describing the changes. - ------------- - A---B---C origin/master - / \ - D---E---F---G---H master ------------- - -See linkgit:git-merge[1] for details, including how conflicts -are presented and handled. - In Git 1.7.0 or later, to cancel a conflicting merge, use `git reset --merge`. *Warning*: In older versions of Git, running 'git pull' with uncommitted changes is discouraged: while possible, it leaves you |