Afternoon all,
urm ... sorry, I'm so terrible at git ...
Cheers
Joe
On Thu, Oct 13, 2016 at 11:07 PM, Yasuo Ohgaki wrote:
> On Fri, Oct 14, 2016 at 4:51 AM, Lauri Kenttä
> wrote:
> > Actually I just followed the lines in the git graph:
> >
> > $ git log origin/PHP-7.1.0RC3 --oneline | hea
On Fri, Oct 14, 2016 at 4:51 AM, Lauri Kenttä wrote:
> Actually I just followed the lines in the git graph:
>
> $ git log origin/PHP-7.1.0RC3 --oneline | head -n2
> 8fe9ea3 Update versions/dates for PHP 7.1.0RC3
> 36d5bed Merge branch 'PHP-7.0' into PHP-7.1
> -> 36d5bed is known to be good, and lu
On 2016-10-13 22:32, Davey Shafik wrote:
On Thu, Oct 13, 2016 at 12:20 PM, Lauri Kenttä
wrote:
On 2016-10-13 20:16, Davey Shafik wrote:
Can anyone shed some light on:
1) when it was merged
2) who merged it
3) how the dates are messed up
1) and 2)
commit fb92482c8ad1e35b82c4d7b758ae0f1f5e
On Thu, Oct 13, 2016 at 12:20 PM, Lauri Kenttä
wrote:
> On 2016-10-13 20:16, Davey Shafik wrote:
>
>> Can anyone shed some light on:
>>
>> 1) when it was merged
>> 2) who merged it
>> 3) how the dates are messed up
>>
>
>
> 1) and 2)
>
> commit fb92482c8ad1e35b82c4d7b758ae0f1f5ecd4929
> Merge: b0
On 2016-10-13 20:16, Davey Shafik wrote:
Can anyone shed some light on:
1) when it was merged
2) who merged it
3) how the dates are messed up
1) and 2)
commit fb92482c8ad1e35b82c4d7b758ae0f1f5ecd4929
Merge: b0cacee 4b8bdac
Author: Joe Watkins
Date: Mon Oct 10 12:17:11 2016 +0100
Merg
Hey folks,
I have a bit of a mystery on my hands.
Yasuo brought to my attention last night that it looked like someone had
merged master into the PHP-7.1 branch, and indeed when Joe and I tried to
build today that was the case.
Proof: https://github.com/php/php-src/blob/PHP-7.1/main/php_version.
