Elijah Newren via GitGitGadget wrote: > From: Elijah Newren <newren@xxxxxxxxx> > > The --rebase[=...] flags and the various ff flags are incompatible, > except that --no-rebase (or --rebase=false) work with any of the ff > flags, and --ff works with any of the rebase flags. This is wrong, the following commands should work git -c pull.ff=only -c pull.rebase=true pull git -c pull.ff=only -c pull.rebase=true pull --no-rebase -- Felipe Contreras
