Merge pull request #1619 from Chris54721/patch-3

[git/en] Fixed 'git pull' documentation
This commit is contained in:
ven 2015-10-18 13:47:48 +02:00
commit 769304a22f

View File

@ -371,9 +371,12 @@ Pulls from a repository and merges it with another branch.
# Update your local repo, by merging in new changes
# from the remote "origin" and "master" branch.
# git pull <remote> <branch>
# git pull => implicitly defaults to => git pull origin master
$ git pull origin master
# By default, git pull will update your current branch
# by merging in new changes from its remote-tracking branch
$ git pull
# Merge in changes from remote branch and rebase
# branch commits onto your local repo, like: "git pull <remote> <branch>, git rebase <branch>"
$ git pull origin master --rebase