Messages in this thread | | | From | Junio C Hamano <> | Subject | Re: [PATCH] Move read_mostly definition to asm/cache.h | Date | Sun, 15 Jan 2006 01:48:02 -0800 |
| |
Kyle McMartin <kyle@parisc-linux.org> writes:
> 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?
Yes.
> 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. :)
After making the mistake of committing to "master":
$ git commit ;# oops, to the master $ git show-branch origin master read-mostly ! [origin] latest update from Linus * [master] latest for read-mostly -- * [master] latest for read-mostly +* [origin] last update from Linus
you could do this, which would be easier to visualize:
$ git branch read-mostly ;# may need branch "-f" if exists. $ git reset --hard HEAD^ ;# rewind the current head by one.
Which would give you this:
$ git show-branch origin master read-mostly ! [origin] latest update from Linus * [master] latest update from Linus ! [read-mostly] latest for read-mostly -- ! [read-mostly] latest for read-mostly +*! [origin] last update from Linus
- 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/
| |