From: Eric Wong <normalperson@yhbt.net>
Date: Tue, 18 Sep 2007 01:39:15 GMT
Subject: Re: [PATCH] git-merge: add option --no-ff
Message-ID: <20070918013915.GC13571@hand.yhbt.net>
In-Reply-To: <7vk5qoye2t.fsf@gitster.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> wrote:
> 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?

It could be another simple independent script, then.  git-svn isn't
installed on most distros when git is, so it won't always work...

-- 
Eric Wong