Changed default push setting to upstream and tidied up the diff and merge tool settings.