info/learnxinyminutes-docs
1
0
Fork 0
mirror of https://github.com/adambard/learnxinyminutes-docs.git synced 2025-08-09 16:26:53 +02:00
Code Issues Releases Wiki Activity

Merge pull request #177 from johncowie/master

Browse Source 
Explain git pull default behaviour and the use of --rebase flag.
This commit is contained in:
Adam Bard
2013-08-08 11:29:14 -07:00
parent f71ebeacdb 674e8a0eeb
commit 576548e08f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
git.html.markdown
View File

@@ -310,7 +310,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
# 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
``` ```
### push ### push