Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59050
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+EWWV6g3aFOVF+Or99yijJu5Uo-Bt2ObNZ7Fs6UWv3zLg@mail.gmail.com>
References: <slrnjmeju4.mfm.dsp@experimentalworks.net>
	<CAKOpQSyLSXJU77T03ayj1zw7MeBhom_V58NO8PFu+R_KpH_GvQ@mail.gmail.com>
	<CAJWj5+EWWV6g3aFOVF+Or99yijJu5Uo-Bt2ObNZ7Fs6UWv3zLg@mail.gmail.com>
Date: Mon, 19 Mar 2012 11:58:11 -0700
Message-ID: <CAKOpQSy1eeWDgTCnD7bRvr_+icsj1ExEhuiHvogNsshaB6u3sg@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=f46d043892b5c9bc9e04bb9d231a
Subject: Re: [PHP-DEV] php-src is now on git
From: kris.craig@gmail.com (Kris Craig)

--f46d043892b5c9bc9e04bb9d231a
Content-Type: text/plain; charset=ISO-8859-1

Simon,

On Mon, Mar 19, 2012 at 11:55 AM, Simon Schick
<simonsimcity@googlemail.com>wrote:

> 2012/3/19 Kris Craig <kris.craig@gmail.com>:
> > Hey,
> >
> > Could we modify the workflow to recommend using the "--no-ff" switch when
> > merging in a feature branch?  This is by and large the recommended
> approach
> > as it preserves the feature branch's commit history, making it
> > *much*easier to sort through complex features that contain numerous
> > commits.
> >
> > --Kris
>
> Hi, Kris
>
> I'd instead suggest to execute the following command in the git-repository:
>
> git config --add merge.ff false
>
> Then you do not have to add --no-ff to every merge-command you're doing.
>
> You could even set it per branch if you want :) (just to round it up ..)
>
> http://stackoverflow.com/questions/2500296/can-i-make-fast-forwarding-be-off-by-default-in-git
>
> Bye
> 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

--f46d043892b5c9bc9e04bb9d231a--