From 674e8a0eebfa15afe51c6960cec9712fa186ef45 Mon Sep 17 00:00:00 2001
From: John Cowie <john.a.cowie@gmail.com>
Date: Thu, 8 Aug 2013 17:38:06 +0100
Subject: Explain git pull default behaviour and the use of --rebase flag.

By far the pull command I use the most is 'git pull --rebase', so wanted to add some info to make it clear that that's possible.
---
 git.html.markdown | 5 +++++
 1 file changed, 5 insertions(+)

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
-- 
cgit v1.2.3