lkml.org 
[lkml]   [2006]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [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/

\
 
 \ /
  Last update: 2006-01-12 06:39    [W:0.649 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site