From: Michael Fischer <michael@visv.net>
Date: Sat, 18 Feb 2006 04:31:13 GMT
Subject: Re: [ANNOUNCE] GIT 1.2.1
Message-ID: <20060218043113.GA8976@blinkenlights.visv.net>
In-Reply-To: <7vzmkrizuw.fsf@assigned-by-dhcp.cox.net>


*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.