summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--git.html.markdown5
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