Update .gitconfig

Add me and menoff (merge and merge --no-ff)