Messages in this thread | | | Date | Thu, 12 Jan 2006 00:36:18 -0500 | From | Kyle McMartin <> | Subject | Re: [PATCH] Move read_mostly definition to asm/cache.h |
| |
On Wed, Jan 11, 2006 at 01:20:27PM -0800, Junio C Hamano wrote: > Essentially, you are (you want to be) in read_mostly branch, but > your .git/HEAD incorrectly says you are on the master branch. > So you would need: > > $ git symbolic-ref HEAD refs/heads/read_mostly > > after swapping. Then you would be on read_mostly branch. >
Alternatively, if I had (I haven't touched the tree, just format-patch'd which looked right) used git-reset --hard HEAD and been up to date (working tree and index file) with whatever ended up being pointed to by HEAD, right?
I'll try to remember the symbolic-ref thing for next time, usually when this happens I just blow away the last commit and try again, but I felt adventurous today. :)
Cheers, Kyle - 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/
| |