Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: topic branches
author
Junio C Hamano
<junkio@cox.net>
Wed, 14 Dec 2005 20:57:49 +0000
(12:57 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 14 Dec 2005 20:57:49 +0000
(12:57 -0800)
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>
Documentation/howto/using-topic-branches.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
01f49e3
)
diff --git
a/Documentation/howto/using-topic-branches.txt
b/Documentation/howto/using-topic-branches.txt
index 4698abe46bff0b878dcfcd05771f5760483b4278..494429738f8f86bbe21f38b5f90cc94344ad0630 100644
(file)
--- a/
Documentation/howto/using-topic-branches.txt
+++ b/
Documentation/howto/using-topic-branches.txt
@@
-31,7
+31,7
@@
test tree and then pull to the release tree as that would leave trivial
patches blocked in the test tree waiting for complex changes to accumulate
enough test time to graduate.
patches blocked in the test tree waiting for complex changes to accumulate
enough test time to graduate.
-Back in the BitKeeper days I achieved this
m
y creating small forests of
+Back in the BitKeeper days I achieved this
b
y creating small forests of
temporary trees, one tree for each logical grouping of patches, and then
pulling changes from these trees first to the test tree, and then to the
release tree. At first I replicated this in GIT, but then I realised
temporary trees, one tree for each logical grouping of patches, and then
pulling changes from these trees first to the test tree, and then to the
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.
First create your work tree by cloning Linus's public tree:
First create your work tree by cloning Linus's public tree:
- $ git clone rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work
+ $ git clone \
+ master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work
Change directory into the cloned tree you just created
Change directory into the cloned tree you just created
@@
-52,7
+53,7
@@
Set up a remotes file so that you can fetch the latest from Linus' master
branch into a local branch named "linus":
$ cat > .git/remotes/linus
branch into a local branch named "linus":
$ cat > .git/remotes/linus
- URL:
rsync://rsync.kernel.org
/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+ URL:
master.kernel.org:
/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Pull: master:linus
^D
Pull: master:linus
^D