Alex Henrie wrote: > 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. > > Per the discussion on the mailing list, explicitly passing --rebase on > the command line countermands pull.ff=only in the configuration or a > previous --ff-only on the command line. > > The --no-ff in `git pull --rebase --no-ff` is still ignored. > > Signed-off-by: Alex Henrie <alexhenrie24@xxxxxxxxx> > --- > This is the code I was working on when Elijah sent his patch set to > accomplish the same general goals. Mine is a less ambitious (and less > invasive) approach, but I don't care which solution wins. This is a better approach than Elijah's because it doesn't fail if both pull.ff and pull.rebase are configured. But there's still the problem that the new behavior cannot be configured. -- Felipe Contreras
