Re: Re: Merging O+ into 5.5

On Fri, Mar 15, 2013 at 10:24 AM, Dmitry Stogov <dmitry@zend.com> wrote: > I mean not "git subtree merge" but "git read-dir --prefix ...". > Actually it imports all the history form O+ repo, but it's recorded with > original patches (e.g. ZendAccelerator.h instead of moved > ext/ZendOptimizerPlus/ZendAccelerator.h), so you can see it running "git > log", but not "git log ext/ZendOptimizerPlus/ZendAccelerator.h". Here you are: $ git clone git://github.com/zend-dev/ZendOptimizerPlus.git $ git clone git://github.com/php/php-src.git $ cd php-src $ git remote add opcode ../ZendOptimizerPlus $ git checkout -b opcode opcode/master $ git filter-branch -f --index-filter 'git read-tree --empty ; git read-tree --prefix=ext/opcode "$GIT_COMMIT"' HEAD $ git checkout -b master origin/master $ git merge opcode Damien