Add a gdiffw alias for doing word-based diffing and coloring.
Add defaults to git to always push to the upstream branch if it is not specified, and to merge the same way.  Also, without any options, only fast-forward merges are allowed.