MergeFromCaucho

Update repo with Caucho’s SVN

List changed files since the reference commit (only modules/quercus/* files)

git log —name-status —pretty=oneline #REFCOMMITIDHERE#..HEAD modules/quercus/

Current reference

Resin

git-svn-id: svn://svn.caucho.com/resin/trunk@7491 9c94448d-38f1-0310-a231-d98308ff1ebf
commit-id: ee69b3b7476b539fb2d58ac0662535508e863884

Quercus

git-svn-id: svn://svn.caucho.com/resin/trunk@7737 9c94448d-38f1-0310-a231-d98308ff1ebf
commit-id: b1a78929f4867f8986f1e21f2c8dbef260c425d3

Delayed commits: 63a890dacc62b22df2469e0b45f713a63ddbf58d, 3d93b72687ce3fef52149d36993c593b257a50d8

And after ?

You can merge changes with git cherry-pick to copy commits or you can use git format-patch to be able to apply patches manually.