* Rene Herman (rene.herman@xxxxxxxxx) 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 git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html