Cutools (a.k.a Check Upgrade Tools)
For this moment only git is supported.
Checks if local modifications are in remote branch
$ cugit check origin/master [files]
Now showing the diff
$ cugit check origin/master [files] --diff
Generate a diff for applying after merge remote branch
$ cugit diff origin/master [files]
Saving the diff
$ cugit diff origin/master > to_apply.diff