From: Sam Vilain <sam@vilain.net>
Date: Tue, 18 Sep 2007 07:30:41 GMT
Subject: Re: [PATCH] git-merge: add option --no-ff
Message-ID: <46EF7EA1.6020402@vilain.net>
In-Reply-To: <7v4phsxy55.fsf@gitster.siamese.dyndns.org>

Junio C Hamano wrote:
> "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.

I think we 'just' need to fix pushing merges back to SVN - so that they
properly set Subversion 1.5+ (and possibly SVK) merge attributes - and
if it is ambiguous which branch to push to, force the user to decide.

Sam.