From: Michael Fischer <michael@visv.net>
To: git@vger.kernel.org
Subject: Re: [ANNOUNCE] GIT 1.2.1
Date: Fri, 17 Feb 2006 23:31:13 -0500 [thread overview]
Message-ID: <20060218043113.GA8976@blinkenlights.visv.net> (raw)
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.
next prev parent reply other threads:[~2006-02-18 4:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-16 6:25 [ANNOUNCE] GIT 1.2.1 Junio C Hamano
2006-02-18 4:31 ` Michael Fischer [this message]
2006-02-18 10:39 ` Andreas Ericsson
-- strict thread matches above, loose matches on Subject: below --
2006-02-16 6:47 Brown, Len
2006-02-16 21:41 ` Greg KH
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=20060218043113.GA8976@blinkenlights.visv.net \
--to=michael@visv.net \
--cc=git@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).