From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 18 Sep 2007 12:29:25 GMT
Subject: Re: [PATCH] git-merge: add option --no-ff
Message-ID: <Pine.LNX.4.64.0709181319050.28586@racer.site>
In-Reply-To: <8c5c35580709180419i4500a2d4s8a997d45dd31944e@mail.gmail.com>

Hi,

On Tue, 18 Sep 2007, Lars Hjemli wrote:

> Sidenote: this might be slightly controversial, but I've sometimes 
> missed a --no-ff option to 'git merge' when working on plain git 
> repositories; IMHO preserving the 'logical' merge history when the merge 
> of a topic branch results in a fast-forward can be interesting.

Linus explained a lot of times why this is wrong.  It encourages 
upstream-downstream thinking.  We should really turn this into a FAQ.

Ciao,
Dscho