Re: pull into dirty working tree

From: Olivier Galibert <galibert@pobox.com>
Date: Jun 14, 2007, 20:20 UTC
Message-ID: <20070614202027.GA47039@dspnet.fr.eu.org>
In-Reply-To: <alpine.LFD.0.98.0706140836450.14121@woody.linux-foundation.org>

On Thu, Jun 14, 2007 at 08:46:27AM -0700, Linus Torvalds wrote:

> So it might be easier to take a "git stash ; git pull ; git unstash" 
> approach instead of making "git pull" handle working tree conflicts 
> itseld.

Isn't that "git add .; git commit; git fetch; git rebase <something>; git reset ^HEAD"? With the conflict resolution happening at rebase time.

OG.

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