[or-cvs] [githax/master] Add a note on rebasing published branches

[Nick Mathewson]

Author: Sebastian Hahn <sebastian at torproject.org>
Date: Wed, 6 May 2009 14:07:34 +0200
Subject: Add a note on rebasing published branches
Commit: 22891a58e9bfccdb9d8c5c360566fc52c9270040

There are times when it is OK to do, and times where it is not.
Hopefully, this makes it easier to make a distinction.
---
 doc/Howto.txt |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/doc/Howto.txt b/doc/Howto.txt
index f4edebf..2730d85 100644
--- a/doc/Howto.txt
+++ b/doc/Howto.txt
@@ -295,7 +295,7 @@ the pre-pull version.  We have a few choices.
 
    Rebasing is a fine thing to do on a _local_ branch, but you should never
    do it (or any other kind of "history rewriting") on a branch you have
-   published to others.
+   published to others. See the next topic for details.
 
 
 
@@ -340,6 +340,13 @@ repository yet, it will be created:
 % git push public ftp
 -----
 
+Note that if you do not tell others explictly that you might be rebasing
+this branch, they could start basing work on it. When you then change the
+history, they will have some work to get their repositories back up in
+sync with your changes. Also note that rebasing branches intended for the
+maintainer of the project is not a bad thing - it helps to make his job
+easier by allowing fast-forwards when possible.
+
 See the instructions at
 
 http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#pushing-changes-to-a-public-repository
-- 
1.5.6.5