diff options
| author | Camilo Garrido <hiro.hope@gmail.com> | 2013-08-11 12:47:21 -0400 |
|---|---|---|
| committer | Camilo Garrido <hiro.hope@gmail.com> | 2013-08-11 12:47:21 -0400 |
| commit | e6bae9cbd39dbed3b5db2f1673a954132ce889e2 (patch) | |
| tree | cd2909593568b94616329abd43a0016be05473ff /git.html.markdown | |
| parent | 80ea89b58a470f9b1a4ce7710f4de6ac69dee5ee (diff) | |
| parent | 28b26b85ff3a94501adc0550c484c90d3e76fb90 (diff) | |
Merge branch 'master' of github.com:adambard/learnxinyminutes-docs
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 |