Merge "fix(docs): correct `--no-ff` -> `--ff-only`"