From: Alex Riesen <raa.lkml@gmail.com>
Date: Tue, 06 Nov 2007 07:40:22 GMT
Subject: Re: git pull opinion
Message-ID: <20071106074022.GC3021@steel.home>
In-Reply-To: <3abd05a90711052230y4d6151c6o3e7985a0c8e18161@mail.gmail.com>

Aghiles, Tue, Nov 06, 2007 07:30:23 +0100:
> > I respectfully beg to differ.  I think it is entirely reasonable, and
> > not a sign of "centralized" mindset, to want to pull changes others
> > have made into your dirty repository with a single command.
> 
> BitKeeper, for example, does a merge with a "dirty" directory.

Git does merge with dirty working directory. It just wont touch the
changed files and stop merging if the merge requires it.