Skip to content

Commit

Permalink
Better advice on using topic branches for kernel development
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Luck, Tony authored and Junio C Hamano committed Oct 14, 2010
1 parent 2475770 commit 352953a
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions Documentation/user-manual.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 352953a

Please sign in to comment.