Re: [patch] add simple git documentation
- From
- Andrew Morton <akpm@osdl.org>
- Date
- May 7, 2005, 00:58 UTC
- Message-ID
- <20050506175835.65b9c9c1.akpm@osdl.org>
- In-Reply-To
- <20050505102600.GA16387@elf.ucw.cz>
Pavel Machek <pavel@ucw.cz> wrote:
> > This adds short intro to git aimed at kernel hackers. >
OK, but I'm hoping that shortly we'll have something more complete than this, and your patch might not be a suitable starting point for that. (Large hint-dropping sounds).
Show 57 quoted lines
> > --- > commit addb0833bdadda14495d66749e6cb95b6a9445d7 > tree 7e66cb899004fbec0fadae5c9265d0731d3a26f3 > parent 1f9ca1262e6b27dde44d456a87c456d15f0a9b80 > author <pavel@amd.(none)> 1115288688 +0200 > committer <pavel@amd.(none)> 1115288688 +0200 > > Index: Documentation/git.txt > =================================================================== > --- /dev/null (tree:de65e7579ed050d324357e3040b37c561676ab7d) > +++ 7e66cb899004fbec0fadae5c9265d0731d3a26f3/Documentation/git.txt (mode:100644 sha1:353d5ae7f46eeb79c058be611cb429622167f784) > @@ -0,0 +1,41 @@ > + Kernel hacker's guide to git > + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > + 2005 Pavel Machek <pavel@suse.cz> > + > +You can get cogito at http://www.kernel.org/pub/software/scm/cogito/ > +. Compile it, and place it somewhere in $PATH. Then you can get kernel > +by running > + > +mkdir clean-cg; cd clean-cg > +cg-init rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git > + > +... Do cg-update origin to pickup latest changes from Linus. You can > +do cg-diff to see what changes you done in your local tree. cg-cancel > +will kill any such changes, and cg-commit will make them permanent. > + > +To get diff between your working tree and "next tree up", do cg-diff > +-r origin: . If you want to get the same diff but separated > +patch-by-patch, do cg-mkpatch origin: . If you want to pull changes > +from the "up" tree to your working tree, do cg-update origin. > + > + > +How to set up your trees so that you can cooperate with Linus > +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > + > +What I did: > + > +Created clean-cg. Initialized straight from Linus (as above). Then I > +created "nice" tree, good for Linus to pull from > + > +mkdir /data/l/linux-good; cd /data/l/linux-good > +cg-init /data/l/clean-cg > + > +and then my working tree, based on linux-good > + > +mkdir /data/l/linux-cg; cd /data/l/linux-cg > +cg-init /data/l/linux-good > + > +. I do my work in linux-cg. If someone sends me nice patch I should > +pass up, I apply it to linux-good with nice message and do > + > +cd /data/l/linux-cg; cg-update origin > > -- > Boycott Kodak -- for their patent abuse against Java.