Some nice Git aliases and ff-only configuration