diff options
| author | Adam Bard <github@adambard.com> | 2013-08-08 11:29:14 -0700 |
|---|---|---|
| committer | Adam Bard <github@adambard.com> | 2013-08-08 11:29:14 -0700 |
| commit | 576548e08fd6c1e11a9cd0a0f2ec70435022f1b2 (patch) | |
| tree | 0333c18daa40b344e1db4c4baf4d7ff8bce9017f /git.html.markdown | |
| parent | f71ebeacdb05c22a3f6e054f73ae95ee772eee69 (diff) | |
| parent | 674e8a0eebfa15afe51c6960cec9712fa186ef45 (diff) | |
Merge pull request #177 from johncowie/master
Explain git pull default behaviour and the use of --rebase flag.
Diffstat (limited to 'git.html.markdown')
| -rw-r--r-- | git.html.markdown | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git.html.markdown b/git.html.markdown index 00f38d60..d8537300 100644 --- a/git.html.markdown +++ b/git.html.markdown @@ -310,7 +310,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 + +# 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 |