Re: pull into dirty working tree

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.