adambard/learnxinyminutes-docs
1
1
Fork 0
mirror of https://github.com/adambard/learnxinyminutes-docs.git synced 2024-10-05 00:58:17 +03:00
Code Issues Projects Releases Wiki Activity

[git/en] Fixed 'git pull' documentation

Browse Source 
While translating git.html.markdown to Italian, I found a mistake: `git pull` does not default to `git pull origin master`. By default, it updates the current branch by merging changes from its remote-tracking branch.
This commit is contained in:
Chris54721 2015-10-18 13:47:03 +02:00
parent 6051783214
commit 670e71c499
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git.html.markdown
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 # Update your local repo, by merging in new changes
# from the remote "origin" and "master" branch. # from the remote "origin" and "master" branch.
# git pull <remote> <branch> # git pull <remote> <branch>
# git pull => implicitly defaults to => git pull origin master
$ 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 # Merge in changes from remote branch and rebase
# branch commits onto your local repo, like: "git pull <remote> <branch>, git rebase <branch>" # branch commits onto your local repo, like: "git pull <remote> <branch>, git rebase <branch>"
$ git pull origin master --rebase $ git pull origin master --rebase