Try the Deploy for Commits plugin for PhpStorm.
It should definitely simplify all the options described in the latest answers from other participants.