Re: GIT and the current -stable

[Junio C Hamano <junkio@cox.net>]

Rene Herman <rene.herman@gmail.com> writes:

> 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 think adding these lines to .git/config would do the trick,
after you have done the "checkout -b v2.6.20 v2.6.20" step:

[branch "v2.6.20"]
	remote = stable
	merge = refs/heads/master
[remote "stable"]
	url = git://git.kernel.org/.../stable/linux-2.6.20.y.git
	fetch = refs/heads/master

provided if stable team forks v2.6.20.y history off of Linus's
v2.6.20.

With the above configuration, anytime you say "git pull" while
on your v2.6.20 branch will fetch from "stable" and merge their
'master' branch in your current branch (i.e. v2.6.20 branch).

-
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/