Skip to content

Commit 352953a

Browse files
aeglgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2475770 commit 352953a

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Documentation/user-manual.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2171,11 +2171,14 @@ $ git push mytree release
21712171

21722172
Now to apply some patches from the community. Think of a short
21732173
snappy name for a branch to hold this patch (or related group of
2174-
patches), and create a new branch from the current tip of Linus's
2175-
branch:
2174+
patches), and create a new branch from a recent stable tag of
2175+
Linus's branch. Picking a stable base for your branch will:
2176+
1) help you: by avoiding inclusion of unrelated and perhaps lightly
2177+
tested changes
2178+
2) help future bug hunters that use "git bisect" to find problems
21762179

21772180
-------------------------------------------------
2178-
$ git checkout -b speed-up-spinlocks origin
2181+
$ git checkout -b speed-up-spinlocks v2.6.35
21792182
-------------------------------------------------
21802183

21812184
Now you apply the patch(es), run some tests, and commit the change(s). If

0 commit comments

Comments
 (0)