From: "J. Bruce Fields" <bfields@fieldses.org>
To: Jeff Garzik <jeff@garzik.org>
Cc: David Brown <dmlb2000@gmail.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
kvm-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org
Subject: Re: [kvm-devel] [GIT PULL] kvm oops fix
Date: Thu, 19 Apr 2007 15:40:36 -0400 [thread overview]
Message-ID: <20070419194036.GL9101@fieldses.org> (raw)
In-Reply-To: <4627C429.2020500@garzik.org>
On Thu, Apr 19, 2007 at 03:34:01PM -0400, Jeff Garzik wrote:
> David Brown wrote:
> >>What is the easiest way to completely undo a pull, reverting the branch
> >>to the HEAD present before the pull?
> >>
> >
> >If the pull doesn't merge successfully then usually doing a `git-reset
> >--hard` will blow everything away back to normal, but Linus may do
> >different things.
>
> I'm thinking about a successful pull that one later regrets :)
git reset --hard ORIG_HEAD, if the pull is the last thing you did.
Otherwise maybe fire up gitk, look for the point you'd like to revert
to, and cut-n-paste the SHA1 ID to the git reset --hard commandline.
--b.
WARNING: multiple messages have this Message-ID (diff)
From: "J. Bruce Fields" <bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
To: Jeff Garzik <jeff-o2qLIJkoznsdnm+yROfE0A@public.gmane.org>
Cc: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org,
Linus Torvalds
<torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [GIT PULL] kvm oops fix
Date: Thu, 19 Apr 2007 15:40:36 -0400 [thread overview]
Message-ID: <20070419194036.GL9101@fieldses.org> (raw)
In-Reply-To: <4627C429.2020500-o2qLIJkoznsdnm+yROfE0A@public.gmane.org>
On Thu, Apr 19, 2007 at 03:34:01PM -0400, Jeff Garzik wrote:
> David Brown wrote:
> >>What is the easiest way to completely undo a pull, reverting the branch
> >>to the HEAD present before the pull?
> >>
> >
> >If the pull doesn't merge successfully then usually doing a `git-reset
> >--hard` will blow everything away back to normal, but Linus may do
> >different things.
>
> I'm thinking about a successful pull that one later regrets :)
git reset --hard ORIG_HEAD, if the pull is the last thing you did.
Otherwise maybe fire up gitk, look for the point you'd like to revert
to, and cut-n-paste the SHA1 ID to the git reset --hard commandline.
--b.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
next prev parent reply other threads:[~2007-04-19 19:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-19 15:50 [GIT PULL] kvm oops fix Avi Kivity
2007-04-19 15:50 ` Avi Kivity
2007-04-19 16:53 ` Linus Torvalds
2007-04-19 16:53 ` Linus Torvalds
2007-04-19 19:09 ` Jeff Garzik
2007-04-19 19:09 ` Jeff Garzik
2007-04-19 19:24 ` [kvm-devel] " David Brown
2007-04-19 19:24 ` David Brown
2007-04-19 19:34 ` [kvm-devel] " Jeff Garzik
2007-04-19 19:34 ` Jeff Garzik
2007-04-19 19:40 ` J. Bruce Fields [this message]
2007-04-19 19:40 ` J. Bruce Fields
2007-04-19 20:30 ` Linus Torvalds
2007-04-19 20:30 ` Linus Torvalds
2007-04-19 22:59 ` Linus Torvalds
2007-04-19 22:59 ` Linus Torvalds
2007-04-20 4:54 ` [kvm-devel] " David Brown
2007-04-20 4:54 ` David Brown
2007-04-22 5:52 ` [kvm-devel] " Avi Kivity
2007-04-22 5:52 ` Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070419194036.GL9101@fieldses.org \
--to=bfields@fieldses.org \
--cc=dmlb2000@gmail.com \
--cc=jeff@garzik.org \
--cc=kvm-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.