linux-kernel - Re: GIT and the current -stable

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20070414083410.GU6602@sequoia.sous-sol.org>
Date:	Sat, 14 Apr 2007 01:34:10 -0700
From:	Chris Wright <chrisw@...s-sol.org>
To:	Rene Herman <rene.herman@...il.com>
Cc:	Linux Kernel <linux-kernel@...r.kernel.org>,
	Greg KH <greg@...ah.com>, git@...r.kernel.org
Subject: Re: GIT and the current -stable

* Rene Herman (rene.herman@...il.com) wrote:
> Stumbling around with git here. I'd like to use git to efficiently track 
> the current -stable as well as -current. Say, my local tree is a clone of 
> Linus current:
> 
> git clone \ 
> git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git local
> 
> I then branch off a 2.6.20 branch:
> 
> cd local
> git checkout -b v2.6.20 v2.6.20
> 
> to now update to the current -stable I could do:
> 
> git pull \ 
> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git

I've already put a tree like this up on kernel.org.  The master branch
is Linus' tree, and there's branches for each of the stable releases
called linux-2.6.[12-20].y (I didn't add 2.6.11.y).

http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6-stable.git;a=summary

> each time that a new -stable is released. Rather though, I'd like a simple 
> "git pull" to do this while on this branch while a "git pull" while back on 
> the master branch pulls from the originally cloned Linus repo again.

You have to be careful with pull.  It will always want to merge onto your
current branch.

thanks,
-chris
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/