From mboxrd@z Thu Jan 1 00:00:00 1970 From: "J. Bruce Fields" Subject: Re: [GIT PULL] kvm oops fix Date: Thu, 19 Apr 2007 15:40:36 -0400 Message-ID: <20070419194036.GL9101@fieldses.org> References: <1176997839110-git-send-email-avi@qumranet.com> <4627BE6B.8030006@garzik.org> <9c21eeae0704191224g104f4an96b330c6b77c29a7@mail.gmail.com> <4627C429.2020500@garzik.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org, Linus Torvalds , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Jeff Garzik Return-path: Content-Disposition: inline In-Reply-To: <4627C429.2020500-o2qLIJkoznsdnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.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/