X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=web%2Fmanual.m4;h=946b9d0953621b23a3a6e30e62c211674d0c6ea5;hb=64a9cf5877ab9ecf6410596d657914f26830d3f7;hp=14feb5739c771bd2ee16e516b0d36d389d1b454f;hpb=815a277189a2400226d34c90b63e57ab7e734ae9;p=paraslash.git

diff --git a/web/manual.m4 b/web/manual.m4
index 14feb573..946b9d09 100644
--- a/web/manual.m4
+++ b/web/manual.m4
@@ -1866,6 +1866,11 @@ have been merged into "next" are usually not rebased, and you can find
 the tip of topic branches you are interested in from the output of
 "git log next"). You should be able to safely build on top of them.
 
+However, at times "next" will be rebuilt from the tip of "master" to
+get rid of merge commits that will never be in "master. The commit
+that replaces "next" will usually have the identical tree, but it
+will have different ancestry from the tip of "master".
+
 The "pu" (proposed updates) branch bundles the remainder of the
 topic branches.  The "pu" branch, and topic branches that are only in
 "pu", are subject to rebasing in general.  By the above definition