Junio C Hamano wrote: > "Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > > > From: Elijah Newren <newren@xxxxxxxxx> > > > > Fix the last few precedence tests failing in t7601 by now implementing > > the logic to have --[no-]rebase override a pull.ff=only config setting. > > Because we only have opt_rebase and opt_ff, unless we are in a very > early part of the code, we cannot tell if "opt_rebase >= 0" we see > came from the command line or from the configuration, and because > pull.rebase, pull.ff, --rebase=<kind>, and <--ff|--ff-only|--no-ff> > have intricate interactions among them, we'd probably need to behave > differently depending on where "opt_rebase >= 0" came from. Where is that backwards-incompatible change explained in the documentation? -- Felipe Contreras
