|
|
Subscribe / Log in / New account

kernel hacker's git howto

From:  Pavel Machek <pavel@ucw.cz>
To:  kernel list <linux-kernel@vger.kernel.org>
Subject:  kernel hacker's git howto
Date:  Thu, 28 Apr 2005 10:56:57 +0200
Cc:  pasky@ucw.cz, torvalds@osdl.org, Greg KH <greg@kroah.com>

Hi!

Here's my current version of git HOWTO. I'd like your comments...

	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-pull origin followed by
cg-merge 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-pull origin; cg-merge origin

-- 
Boycott Kodak -- for their patent abuse against Java.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Copyright © 2005, Eklektix, Inc.
Comments and public postings are copyrighted by their creators.
Linux is a registered trademark of Linus Torvalds