Add git alias for squashed merges
Add git alias to diff against upstream/master