Re: git pull opinion

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 6, 2007, 18:13 UTC
Message-ID: <7v1wb3i6nx.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <Pine.LNX.4.64.0711061159240.4362@racer.site>

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.

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