gx

https://github.com/evanphx/gx

Gx is 3 git related tools: gx-update, gx-publish, and gx-pull-check gx-update is a replacement for 'git pull' that includes an integrated conflict resolver. gx-pull-check integrates with github to provide the ability to test a pull requests against your tests.