Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59059
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.212.182 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <CAJWj5+GqrCdW0tuVZsQ=GW2n+eV1Q69M_o8h3NOMahGhiwGHmw@mail.gmail.com>
References: <slrnjmeju4.mfm.dsp@experimentalworks.net>
	<CAKOpQSyLSXJU77T03ayj1zw7MeBhom_V58NO8PFu+R_KpH_GvQ@mail.gmail.com>
	<CAJWj5+EWWV6g3aFOVF+Or99yijJu5Uo-Bt2ObNZ7Fs6UWv3zLg@mail.gmail.com>
	<CAKOpQSy1eeWDgTCnD7bRvr_+icsj1ExEhuiHvogNsshaB6u3sg@mail.gmail.com>
	<CAJWj5+GqrCdW0tuVZsQ=GW2n+eV1Q69M_o8h3NOMahGhiwGHmw@mail.gmail.com>
Date: Mon, 19 Mar 2012 13:31:20 -0700
Message-ID: <CAKOpQSweGeOy8vaMaRGc75ia=uC6YRLcZ3YkxKMDL9ZXxubbug@mail.gmail.com>
To: Simon Schick <simonsimcity@googlemail.com>
Cc: David Soria Parra <dsp@php.net>, internals@lists.php.net
Content-Type: multipart/alternative; boundary=f46d043c06bce9392204bb9e70af
Subject: Re: [PHP-DEV] php-src is now on git
From: kris.craig@gmail.com (Kris Craig)

--f46d043c06bce9392204bb9e70af
Content-Type: text/plain; charset=ISO-8859-1

On Mon, Mar 19, 2012 at 1:16 PM, Simon Schick
<simonsimcity@googlemail.com>wrote:

> 2012/3/19 Kris Craig <kris.craig@gmail.com>:
> > Simon,
> >
> > Yes that's a great recommendation and it should definitely be included
> > IMHO!  However, the merge.ff option is relatively new and is not
> available
> > in many older Git clients that are still in use.  So the --no-ff tag will
> > still probably be necessary for some people.  Perhaps we should recommend
> > both, or would that make things too confusing?
> >
> > --Kris
> >
>
> Hi, Kris
>
> Don't really know ... Do you know which version of GIT is the first
> who implements this feature? Would it be a problem to require an
> update or the people should find their own solution?
> I think that people who don't know much about GIT or are just starting
> with GIT should be fine with that as they haven't done much with that
> or just installed the latest version.
> The only problem I can see here is that some linux-distributions
> (Debian for example) tends to keep old versions in their repositories
> ;) Anyways ...
> I think it would be max-information to link the
> stackoverflow-discussion there if someone has a question to that. But
> this (of course) has to be describe it in a easy understandable way :)
> and I think that's the most dificult part.
>
> Bye
> Simon
>

I don't know off the top of my head which version it was implemented in,
but I'm pretty sure it was relatively recent.

Here's what I wound-up doing:  The merge entries on the workflow page now
contain "--no-ff" and I added an entry to the FAQ about the merge.ff option
available in newer clients.  This way we should be covered either way.  =)

--Kris

--f46d043c06bce9392204bb9e70af--