[or-cvs] [githax/master] Introduce rebasing more carefully.

[nickm@xxxxxxxx (Nick Mathewson)]

Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Thu, 30 Apr 2009 00:26:40 -0400
Subject: Introduce rebasing more carefully.
Commit: 9e6b878d45980fbd7a80c2812d4e5c7fdb8d4b1a

---
 doc/Howto-thandy.txt |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/doc/Howto-thandy.txt b/doc/Howto-thandy.txt
index f542ca5..132ff32 100644
--- a/doc/Howto-thandy.txt
+++ b/doc/Howto-thandy.txt
@@ -235,7 +235,7 @@ history, and the head of the 'master' branch now just points at them.
 If there are changes, git will try to merge for you.
 
 `git pull` is essentially just `git fetch` followed by `git merge`. If you
-already have work that is based on a remote branch, you may want to rebase
+already have work that is based on a remote branch, you may want to "rebase"
 instead of letting `git merge` create an implicit merge commit:
 
 -----
@@ -243,6 +243,8 @@ instead of letting `git merge` create an implicit merge commit:
 % git rebase origin/master
 -----
 
+(Rebase with caution!  See notes on rebasing below.)
+
 Now, what should we do about our local ftp branch?  It's still based on
 the pre-pull  version.  We have a few choices.
 
-- 
1.5.6.5