Why the rebase?  Should we do something like git pull --ff-only origin master?