added more configurations to gitconfig, added sdiff alias