From: Felipe Contreras Date: Sat, 17 Jul 2021 18:14:50 GMT Subject: RE: [PATCH 3/9] pull: abort if --ff-only is given and fast-forwarding is impossible Message-ID: <60f31e1a928f2_25f2208cb@natae.notmuch> In-Reply-To: Alex Henrie via GitGitGadget wrote: > From: Alex Henrie > > The warning about pulling without specifying how to reconcile divergent > branches says that after setting pull.rebase to true, --ff-only can > still be passed on the command line to require a fast-forward. Make that > actually work. Once again, this behavior is not explained in the documentation. And this breaks existing behavior. A person currently can configure `pull.ff=only` to tell git that by default she wants `git pull` to fail if the merge is not a fast-forward, but she can override that default behavior with `git pull --rebase`. Now that fails as well. So even though the warning has been saying that users need to specify if to merge or rebase, and the user has specified a rebase, it now fails, so it's a step backwards. -- Felipe Contreras