From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Sep 2007 01:09:14 GMT
Subject: Re: [PATCH] git-merge: add option --no-ff
Message-ID: <7vk5qoye2t.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20070918005013.GA6368@muzzle>

Eric Wong <normalperson@yhbt.net> writes:

> Would automatically enabling --no-ff when it detects merging of two (or
> more) SVN branches be a good thing?  We can add scripting support to
> git-svn for detecting if any given commit is really from SVN or not.
> Then we could do something like this in git-merge
>
> ---------------------------- 8< --------------------------------
> if git-svn test-svn-commits "$@"
> then
> 	no_ff=t
> 	no_fast_forward_strategies=$all_strategies
> fi
> ---------------------------- 8< --------------------------------

Yuck, do I understand you correctly?  Are you talking about
adding dependency on git-svn to git-merge?