Better advice on using topic branches for kernel development

aegl · gitster · commit 352953a556e7 · 2010-10-13T19:10:56.000-07:00
Linus Torvalds wrote:
&gt; The real problem is that maintainers often pick random - and not at
&gt; all stable - points for their development to begin with. They just
&gt; pick some random "this is where Linus -git tree is today", and do
&gt; their development on top of that. THAT is the problem - they are
&gt; unaware that there's some nasty bug in that version.

Maybe they do this because they read it in the Git user-manual.

Fix the manual to give them better guidance.

Signed-off-by: Tony Luck &lt;tony.luck@intel.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
@@ -2171,11 +2171,14 @@ $ git push mytree release
 
 Now to apply some patches from the community.  Think of a short
 snappy name for a branch to hold this patch (or related group of
-patches), and create a new branch from the current tip of Linus's
-branch:
+patches), and create a new branch from a recent stable tag of
+Linus's branch. Picking a stable base for your branch will:
+1) help you: by avoiding inclusion of unrelated and perhaps lightly
+tested changes
+2) help future bug hunters that use "git bisect" to find problems
 
 -------------------------------------------------
-$ git checkout -b speed-up-spinlocks origin
+$ git checkout -b speed-up-spinlocks v2.6.35
 -------------------------------------------------
 
 Now you apply the patch(es), run some tests, and commit the change(s).  If
