SHA1 Hash:	85c6542a1614069f5c2f1279b07a65fb0c4f1fb1
Date:	2009-08-26 18:40:07
User:	drh
Comment:	Update the FAQ to describe the new --private option on the commit command.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified www/faq.wiki from [4f2f594a41] to [7adf59141f].

@@ -64,13 +64,26 @@
 
 <a name="q4"></a>
 <p><b>(4) How do I create a private branch that won't get pushed back to the
   main repository.</b></p>
 
-<blockquote>You cannot.  All branches in fossil are public in the sense that
-are all pushed and pulled together.  There is no way to tell fossil
-to only push or pull a subset of branches.
+<blockquote>Use the <b>--private</b> command-line option on the
+<b>commit</b> command.  The result will be a check-in which exists on
+your local repository only and is never pushed to other repositories.
+All descendents of a private check-in are also private.
+
+Unless you specify something different using the <b>--branch</b> and/or
+<b>--bgcolor</b> options, the new private check-in will be put on a branch
+named "private" with an orange background color.
 
-Of course, as long as you never push, you can make as many private
-changes as you want.</blockquote></li>
+You can merge from the trunk into your private branch in order to keep
+your private branch in sync with the latest changes on the trunk.  Once
+you have everything in your private branch the way you want it, you can
+then merge your private branch back into the trunk and push.  Only the
+final merge operation will appear in other repositories.  It will appear
+as if all the changes that occurred on your private branch occurred in
+a single check-in.
+Of course, you can also keep your private branch private forever simply
+by not merging the changes in the private branch back into the trunk.
+</blockquote></li>
 
 </ol>