git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [ANNOUNCE] GIT 1.2.1

From
MFMichael Fischer <michael@visv.net>
Date
Feb 18, 2006, 04:31 UTC
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.
Previous: Junio C HamanoNext: Andreas Ericsson
Message 2 of 3 in “[ANNOUNCE] GIT 1.2.1”
  1. Junio C HamanoFeb 16, 2006
  2. Michael FischerFeb 18, 2006
  3. Andreas EricssonFeb 18, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.