On 2016-10-13 22:32, Davey Shafik wrote:
On Thu, Oct 13, 2016 at 12:20 PM, Lauri Kenttä
<lauri.ken...@gmail.com> 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: b0cacee 4b8bdac
Author: Joe Watkins <krak...@php.net>
Date: Mon Oct 10 12:17:11 2016 +0100
Merge branch 'PHP-7.1' of https://github.com/php/php-src into
PHP-7.1
How did you figure that out? :D
Thanks for this :)
- Davey
Magic. ;)
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 luckily it's not too old.
$ git log origin/PHP-7.1 --oneline --graph
-> searched for 36d5bed and followed up the PHP-7.1 line, which
is the one with "Merge branch 'PHP-7.0' into PHP-7.1" commits,
whereas the other branch has "Merge branch 'PHP-7.1'" commits.
I suppose git when-merged 36d5bed would do the trick, too.
--
Lauri Kenttä
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
