On Mon, Jul 12, 2021 at 12:20 PM Alex Henrie <alexhenrie24@xxxxxxxxx> wrote: > > And it's not really necessary to make > --ff-only imply --no-rebase because we're going to make `git pull` > handle --ff-only itself without invoking `git merge`. Sorry, I misspoke. I was thinking of the case where fast-forwarding is impossible. If fast-forwarding is possible, --ff-only already effectively implies --no-rebase, and we might want to make that explicit in the documentation. -Alex
