diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-12-14 12:57:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-14 12:57:49 -0800 |
| commit | a4adf54d38ba49e58511aaafd18e99e6d3d4dabb (patch) | |
| tree | 91d89a9f34db40c943fff888ae5ab4e56e5ecfc1 /Documentation/howto | |
| parent | Everyday: a bit more examples. (diff) | |
| download | tgif-a4adf54d38ba49e58511aaafd18e99e6d3d4dabb.tar.xz | |
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>
Diffstat (limited to 'Documentation/howto')
| -rw-r--r-- | Documentation/howto/using-topic-branches.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/howto/using-topic-branches.txt b/Documentation/howto/using-topic-branches.txt index 4698abe46b..494429738f 100644 --- 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. -Back in the BitKeeper days I achieved this my creating small forests of +Back in the BitKeeper days I achieved this by 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 @@ -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: - $ 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 @@ -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 - 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 |