summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuck, Tony <tony.luck@intel.com>2010-10-01 18:57:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-10-14 02:10:56 (GMT)
commit352953a556e7f8d720e26a32d4aabbf823d3c4d4 (patch)
tree56fa5da570842fb4a84ab112279974a1f31b586e
parent24757702395ed4c828af585f2d8ba0efda5cf697 (diff)
downloadgit-352953a556e7f8d720e26a32d4aabbf823d3c4d4.zip
git-352953a556e7f8d720e26a32d4aabbf823d3c4d4.tar.gz
git-352953a556e7f8d720e26a32d4aabbf823d3c4d4.tar.bz2
Better advice on using topic branches for kernel development
Linus Torvalds wrote: > The real problem is that maintainers often pick random - and not at > all stable - points for their development to begin with. They just > pick some random "this is where Linus -git tree is today", and do > their development on top of that. THAT is the problem - they are > 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 <tony.luck@intel.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/user-manual.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 5b6de22..77eb483 100644
--- 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