Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59041
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 74.125.82.42 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <slrnjmeju4.mfm.dsp@experimentalworks.net>
References: <slrnjmeju4.mfm.dsp@experimentalworks.net>
Date: Mon, 19 Mar 2012 11:21:58 -0700
Message-ID: <CAKOpQSyLSXJU77T03ayj1zw7MeBhom_V58NO8PFu+R_KpH_GvQ@mail.gmail.com>
To: David Soria Parra <dsp@php.net>
Cc: internals@lists.php.net
Content-Type: multipart/alternative; boundary=f46d043c06bc4be0e004bb9ca200
Subject: Re: [PHP-DEV] php-src is now on git
From: kris.craig@gmail.com (Kris Craig)

--f46d043c06bc4be0e004bb9ca200
Content-Type: text/plain; charset=ISO-8859-1

Hey,

On Mon, Mar 19, 2012 at 8:24 AM, David Soria Parra <dsp@php.net> wrote:

> Hi Internals,
>
> The initial migration is done and initial testing was successful.
>
>  http://git.php.net/?p=php-src.git;a=summary
>  http://github.com/php/php-src
>
> Please note that some branches and tags were renamed to make
> the repository cleaner.
>
> Please checkout the repository and play around. I have created
> a workflow wiki page at https://wiki.php.net/vcs/gitworkflow.
> There is also an FAQ at https://wiki.php.net/vcs/gitfaq.
>
> If you have questions about the workflow or problems let me know.
> General git questions should be asked in the appropriate IRC channels
> and mailinglists.
>
> David
>
> --
> PHP Internals - PHP Runtime Development Mailing List
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
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

--f46d043c06bc4be0e004bb9ca200--