--ff-only

Also written: pull.ff only, merge --ff-only

An option that makes a pull or merge succeed only if it can fast-forward, and otherwise stop. Rebase then `--ff-only` merge gives a straight line.