fixup! Git tips and tricks