From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Sep 2007 06:53:26 GMT
Subject: Re: [PATCH] git-merge: add option --no-ff
Message-ID: <7v4phsxy55.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <8c5c35580709172312w55613a1bw8cc58b200c526fab@mail.gmail.com>

"Lars Hjemli" <hjemli@gmail.com> writes:

> On 9/18/07, Eric Wong <normalperson@yhbt.net> wrote:
>> Would automatically enabling --no-ff when it detects merging of two (or
>> more) SVN branches be a good thing?
>
> I'd say 'git-svn merge' as a wrapper for 'git merge --no-ff' would be cleaner.

That unfortunately does not solve the problem.