Jeff King <peff@xxxxxxxx> writes: > Ah, that's what I was missing. I agree it would be nice for it to behave > consistently in both cases (though why one would set both pull.ff=only > and pull.rebase=true, I don't know). So an obvious thing we could do, if pull.mode is too much of a change, is to make "pull --rebase" codepath honor pull.ff as well, perhaps? I.e. those who set pull.ff=only are saying that "please stop me when I have any local change---I want to be notified if my pull on this branch results in anything but a fast-forward from the upstream". And then making an unconfigured pull.ff to default to pull.ff=only may give a proper failure whether you merge or rebase. I dunno.
