On Wed, Jan 09, 2008 at 02:35:55PM -0800, Harvey Harrison wrote: > On Wed, 2008-01-09 at 23:28 +0100, Andi Kleen wrote: > > > Do you have a simple recipe to just update from the the remote branch, > > assuming there are no local changes or local branches? > > > > -Andi > > For staying up to date I use the following: > > # Add Linus's tree as a remote > git remote --add linus > git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git > > # Add Ingo's tree as a remote > git remote --add x86 > git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git > > # With that setup, just run the following to get any changes you > # don't have. It will also notice any new branches Ingo/Linus > # add to their repo. Look in .git/config afterwards, the format > # to add new remotes is easy to figure out. > git remote update
I'm already cloning the branches; the problem is not getting conflicts etc. when updating. -Andi -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
