Junio C Hamano wrote: > "Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > > +test_expect_failure '--no-rebase overrides pull.ff=only' ' > > + test_does_need_full_merge -c pull.ff=only pull --no-rebase > > +' > > + > > +test_expect_success '--rebase takes precedence over pull.ff=only' ' > > + test_does_rebase -c pull.ff=only pull --rebase > > +' > > OK. Since when is it OK to test for a new behavior that 1. will break compatibility, 2. is not documented, and 3. has zero consensus? -- Felipe Contreras