# Antw.:  php-src is now on git

- Thread: https://externals.io/message/59056
- Original archive: https://news-web.php.net/php.internals/59056
- Started by dsoria@gmx.net on 2012-03-19T20:02:04+00:00
- Messages: 1
- Reply by email to internals@lists.php.net
- More for agents: search with https://externals.io/search.md?q={query} · JSON API at https://externals.io/api · documentation at https://externals.io/llms.txt

---

## #59056 — dsoria@gmx.net — 2012-03-19T20:02:04+00:00

URL: https://externals.io/message/59056#59056

Its a good idea. Go ahead and change it.

Gesendet mit meinem HTC

----- Reply message -----
Von: "Kris Craig" <kris.craig@gmail.com>
An: "Simon Schick" <simonsimcity@googlemail.com>
Cc: "David Soria Parra" <dsp@php.net>, <internals@lists.php.net>
Betreff: [PHP-DEV] php-src is now on git
Datum: Mo., Mär. 19, 2012 19:58


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>:
> > […]
> approach
> > […]
>
> 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