Set git mergetool to opendiff
Add git upstream alias