From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Jun 2007 20:30:08 GMT
Subject: Re: pull into dirty working tree
Message-ID: <alpine.LFD.0.98.0706141328380.14121@woody.linux-foundation.org>
In-Reply-To: <20070614202027.GA47039@dspnet.fr.eu.org>



On Thu, 14 Jun 2007, Olivier Galibert wrote:

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

No.

The two workflows happen to co-incide *if* the "git pull" is a 
fast-forward, but not if you actually had previous commits that you 
wanted the "git pull" to merge.

So if you want things to actually work as a "git pull with dirty state 
merge", you really do need to do "git stash + git pull + git unstash".

		Linus