From 0780e04511f862b80bc6482194888ff24a3c06c3 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Thu, 15 Apr 2010 22:25:22 +0000
Subject: [PATCH] Enhanced the self-documentation in git setup.

---
 scripts/setup-git.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/setup-git.sh b/scripts/setup-git.sh
index 1a5e36d339..f9f709ff7f 100755
--- a/scripts/setup-git.sh
+++ b/scripts/setup-git.sh
@@ -47,11 +47,21 @@ cat 1>&2 <<EOF
     This does NOT rewrite history on the remote FS repo, but it does
     change the commit hashes in your local tree.
 
+    By default, 'git pull' is equivalent to running:
+
+      git fetch && git merge origin/master
+
+    What we've done here is change things such that 'git pull' is now
+    equivalent to:
+
+      git fetch && git rebase origin/master
+
     If you really want to merge rather than rebasing, run:
 
       git merge <commit>
 
-    See 'man git-config' for more information.
+    See 'man git-config' for more information.  Also see the man pages
+    for git-pull, git-fetch, git-merge, and git-rebase.
 EOF
 
 [ -n "$name" ] \