Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59064 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 3090 invoked from network); 19 Mar 2012 21:01:58 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 19 Mar 2012 21:01:58 -0000 Authentication-Results: pb1.pair.com smtp.mail=kris.craig@gmail.com; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=kris.craig@gmail.com; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 74.125.82.170 as permitted sender) X-PHP-List-Original-Sender: kris.craig@gmail.com X-Host-Fingerprint: 74.125.82.170 mail-we0-f170.google.com Received: from [74.125.82.170] ([74.125.82.170:63823] helo=mail-we0-f170.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 50/93-19822-5CE976F4 for ; Mon, 19 Mar 2012 16:01:57 -0500 Received: by werh12 with SMTP id h12so7414853wer.29 for ; Mon, 19 Mar 2012 14:01:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=MWaI3OTNaMIGR9GfoqbHmHnocVC7F+bHgv0WL6MSc1o=; b=o9vA/t0tT5BZIMyWS6FrI6nGpkdXmy4Swfpy5uk+YgK9ZTrTVA8Uh+GcyYKyeS9M48 54ly1tOglX/sMVNXfzBL4D1Hh5Bo1/5ExLIRvgfFiEpXbLqlPGn+KujNhROljr0xgEHo 729C6J+srwzOkA7OjKuIJbECw7rXuct4fzjVtcy2ZAwfvVAC5VmKP/Sk98ehNsmnwHPO q9N77PNnKte+qoQhSsyKlIMATnqatMKR2W7MOjG3/TlPjq7mG+bH/V4bt7y8jjHh59w/ KaqtFo1MfS437LlDKv1M8B5kPxJ2CcbmlC1f1DLusgyceT0QPKdlM9qlyuCFsB8h0Uo3 +4kA== MIME-Version: 1.0 Received: by 10.180.89.9 with SMTP id bk9mr22887018wib.11.1332190914553; Mon, 19 Mar 2012 14:01:54 -0700 (PDT) Received: by 10.223.116.141 with HTTP; Mon, 19 Mar 2012 14:01:54 -0700 (PDT) In-Reply-To: <4F679987.7000704@oracle.com> References: <4F679987.7000704@oracle.com> Date: Mon, 19 Mar 2012 14:01:54 -0700 Message-ID: To: Christopher Jones Cc: internals@lists.php.net Content-Type: multipart/alternative; boundary=f46d0444812d3c279704bb9edefb Subject: Re: [PHP-DEV] php-src is now on git From: kris.craig@gmail.com (Kris Craig) --f46d0444812d3c279704bb9edefb Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Mon, Mar 19, 2012 at 1:39 PM, Christopher Jones < christopher.jones@oracle.com> wrote: > > > On 03/19/2012 01:31 PM, Kris Craig wrote: > >> I added an entry to the FAQ about the merge.ff option >> available in newer clients. >> > > Would it be more visible if that comment was moved to the Recommended Git > Settings section? > > > Chris > > -- > Email: christopher.jones@oracle.com > Tel: +1 650 506 8630 > Blog: http://blogs.oracle.com/opal/ > > Hmm good idea, I'll move it there and mention the client version requirement (tnx for looking that up, G=E1bor!). --Kris --f46d0444812d3c279704bb9edefb--