From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Jul 2007 17:42:29 GMT
Subject: Re: merge time
Message-ID: <alpine.LFD.0.999.0707301038380.4161@woody.linux-foundation.org>
In-Reply-To: <20070730084138.GA4100@coredump.intra.peff.net>



On Mon, 30 Jul 2007, Jeff King wrote:
> 
> If you followed a strict policy of always merging topics to a "base"
> branch as your first parent, then never allowing fast forwards should
> allow a very easy-to-read history in gitk.

Only if only *one* person ever does any merges.

Immediately when you have other people merging code, you're now back in 
the same boat.

This is why I personally think the whole policy of "no fast forward" is 
totally broken. It's only usable in a non-distributed environment, where 
there is one central person who does everythng (a so-called "star 
topology").

			Linus