From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Fischer <michael@visv.net>
Subject: Re: [ANNOUNCE] GIT 1.2.1
Date: Fri, 17 Feb 2006 23:31:13 -0500
Message-ID: <20060218043113.GA8976@blinkenlights.visv.net>
References: <7vzmkrizuw.fsf@assigned-by-dhcp.cox.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-From: git-owner@vger.kernel.org Sat Feb 18 05:31:30 2006
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by ciao.gmane.org with esmtp (Exim 4.43)
	id 1FAJkg-0003Wa-CP
	for gcvg-git@gmane.org; Sat, 18 Feb 2006 05:31:22 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1750756AbWBREbP (ORCPT <rfc822;gcvg-git@m.gmane.org>);
	Fri, 17 Feb 2006 23:31:15 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750786AbWBREbP
	(ORCPT <rfc822;git-outgoing>); Fri, 17 Feb 2006 23:31:15 -0500
Received: from www.visv.net ([64.81.194.132]:51607 "EHLO visv.net")
	by vger.kernel.org with ESMTP id S1750756AbWBREbP (ORCPT
	<rfc822;git@vger.kernel.org>); Fri, 17 Feb 2006 23:31:15 -0500
Received: by visv.net (Postfix, from userid 1000)
	id 927C6645B4; Fri, 17 Feb 2006 23:31:13 -0500 (EST)
To: git@vger.kernel.org
Mail-Followup-To: Michael Fischer <michael@visv.net>, git@vger.kernel.org
Content-Disposition: inline
In-Reply-To: <7vzmkrizuw.fsf@assigned-by-dhcp.cox.net>
User-Agent: Mutt/1.5.9i
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/16384>


*sigh*

I got confused about git pull origin and git pull master.

Tutorial seems to tell me I should have said git pull origin
and left well enough alone. 

Now I get:

fatal: you need to resolve your current index first

How do I do that?

TIA.


Michael
-- 
Michael Fischer                         Happiness is a config option.
michael@visv.net                        Recompile and be happy.