From: Olivier Galibert <galibert@pobox.com>
Date: Thu, 14 Jun 2007 20:20:27 GMT
Subject: Re: pull into dirty working tree
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.