@matheusbsbs / matheus-bagliano / commits / a4adf54d38
Fork 0

Documentation: topic branches

Recommend git over ssh direct to master.kernel.org, instead of going over rsync to public machines, since this is meant to be a procedure for kernel subsystem maintainers. Also fix an obvious typo. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Dec 14, 2005 at 12:57 UTC a4adf54d38ba49e58511aaafd18e99e6d3d4dabb
1 file changed +4 -3
Documentation/howto/using-topic-branches.txt
+4 -3
@@ -31,7 +31,7 @@ test tree and then pull to the release tree as that would leave trivial
31 patches blocked in the test tree waiting for complex changes to accumulate
32 enough test time to graduate.
33
34 -Back in the BitKeeper days I achieved this my creating small forests of
34 +Back in the BitKeeper days I achieved this by creating small forests of
35 temporary trees, one tree for each logical grouping of patches, and then
36 pulling changes from these trees first to the test tree, and then to the
37 release tree. At first I replicated this in GIT, but then I realised
@@ -42,7 +42,8 @@ So here is the step-by-step guide how this all works for me.
42
43 First create your work tree by cloning Linus's public tree:
44
45 - $ git clone rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work
45 + $ git clone \
46 + master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work
47
48 Change directory into the cloned tree you just created
49
@@ -52,7 +53,7 @@ Set up a remotes file so that you can fetch the latest from Linus' master
53 branch into a local branch named "linus":
54
55 $ cat > .git/remotes/linus
55 - URL: rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
56 + URL: master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
57 Pull: master:linus
58 ^D
59