Messages in this thread | | | Date | Thu, 10 Jan 2008 00:21:22 +0100 | From | Björn Steinbrink <> | Subject | Re: More breakage in native_rdtsc out of line in git-x86 |
| |
On 2008.01.09 23:41:42 +0100, Andi Kleen wrote: > 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.
I guess you're using "git pull" to update a local branch? That will try to merge the new state of x86/mm into your local branch, and that breaks. If you just want to have a local branch that gives you a "fixed" state of x86/mm regardless of whether or not you already fetched newer ones, you can do:
git branch myThing x86/mm # create the branch
work/test/whatever
To fetch a new "state" from the remote: git fetch x86/mm # or git remote update, or whatever
To update your branch to point to the new state: git branch - f myThing x86/mm
That basically replaces it with a new branch of the same name, but pointing to the new x86/mm.
Or if you want to get your working tree to that state at the same time, you can also do: git checkout myThing git reset --hard x86/mm
Björn -- 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/
| |