From mboxrd@z Thu Jan  1 00:00:00 1970
From: Junio C Hamano <gitster@pobox.com>
Subject: Re: git pull opinion
Date: Tue, 06 Nov 2007 10:13:22 -0800
Message-ID: <7v1wb3i6nx.fsf@gitster.siamese.dyndns.org>
References: <3abd05a90711051352t2f6be00bsa862585abd370fb1@mail.gmail.com>
	<fgo5dt$avh$1@ger.gmane.org>
	<Pine.LNX.4.64.0711060007010.4362@racer.site>
	<3abd05a90711052022j590f1faesb85f4646afd9acec@mail.gmail.com>
	<Pine.LNX.4.64.0711061159240.4362@racer.site>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: Aghiles <aghilesk@gmail.com>, Jakub Narebski <jnareb@gmail.com>,
	git@vger.kernel.org
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
X-From: git-owner@vger.kernel.org Tue Nov 06 19:14:01 2007
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1IpSvo-00024p-JA
	for gcvg-git-2@gmane.org; Tue, 06 Nov 2007 19:13:45 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753247AbXKFSN3 (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Tue, 6 Nov 2007 13:13:29 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753459AbXKFSN3
	(ORCPT <rfc822;git-outgoing>); Tue, 6 Nov 2007 13:13:29 -0500
Received: from sceptre.pobox.com ([207.106.133.20]:55397 "EHLO
	sceptre.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753062AbXKFSN3 (ORCPT <rfc822;git@vger.kernel.org>);
	Tue, 6 Nov 2007 13:13:29 -0500
Received: from sceptre (localhost.localdomain [127.0.0.1])
	by sceptre.pobox.com (Postfix) with ESMTP id 6511F2F2;
	Tue,  6 Nov 2007 13:13:50 -0500 (EST)
Received: from pobox.com (ip68-225-240-77.oc.oc.cox.net [68.225.240.77])
	(using TLSv1 with cipher AES128-SHA (128/128 bits))
	(No client certificate requested)
	by sceptre.sasl.smtp.pobox.com (Postfix) with ESMTP id DFF2B92D45;
	Tue,  6 Nov 2007 13:13:45 -0500 (EST)
In-Reply-To: <Pine.LNX.4.64.0711061159240.4362@racer.site> (Johannes
	Schindelin's message of "Tue, 6 Nov 2007 12:02:25 +0000 (GMT)")
User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux)
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/63696>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> A pull is just a fetch and a merge.  And a merge is a commit with more 
> than one parent.  So you can use the command "git reset --hard HEAD^" to 
> undo a merge, just as you can undo any other commit.

*DANGER*

A pull is usually just a fetch and a merge, but sometimes it can
fast forward.  ORIG_HEAD, not HEAD^, points at the previous HEAD
location in both cases.