public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Pavel Machek <pavel@ucw.cz>
To: kernel list <linux-kernel@vger.kernel.org>
Cc: pasky@ucw.cz, torvalds@osdl.org, Greg KH <greg@kroah.com>
Subject: kernel hacker's git howto
Date: Thu, 28 Apr 2005 10:56:57 +0200	[thread overview]
Message-ID: <20050428085657.GA30800@elf.ucw.cz> (raw)

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.

             reply	other threads:[~2005-04-28  8:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-04-28  8:56 Pavel Machek [this message]
2005-04-28  9:18 ` kernel hacker's git howto Petr Baudis
2005-04-28 10:22 ` David Greaves

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050428085657.GA30800@elf.ucw.cz \
    --to=pavel@ucw.cz \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pasky@ucw.cz \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox