Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59049
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain googlemail.com designates 209.85.213.170 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <CAKOpQSyLSXJU77T03ayj1zw7MeBhom_V58NO8PFu+R_KpH_GvQ@mail.gmail.com>
References: <slrnjmeju4.mfm.dsp@experimentalworks.net>
	<CAKOpQSyLSXJU77T03ayj1zw7MeBhom_V58NO8PFu+R_KpH_GvQ@mail.gmail.com>
Date: Mon, 19 Mar 2012 19:55:01 +0100
Message-ID: <CAJWj5+EWWV6g3aFOVF+Or99yijJu5Uo-Bt2ObNZ7Fs6UWv3zLg@mail.gmail.com>
To: Kris Craig <kris.craig@gmail.com>
Cc: David Soria Parra <dsp@php.net>, internals@lists.php.net
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [PHP-DEV] php-src is now on git
From: simonsimcity@googlemail.com (Simon Schick)

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? =C2=A0This is by and large the recommended a=
pproach
> 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-of=
f-by-default-in-git

Bye
Simon