Added undo alias and remove branch.autosetuprebase=always