On Thu, Jul 15, 2021 at 12:58 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Elijah Newren <newren@xxxxxxxxx> writes: > > > Let me ask two questions: > > > > 1. When is it beneficial for users to set both pull.ff and pull.rebase? > > 2. Is it harmful to users for us to allow both to be set when we will > > just ignore one? > > > > I believe the answer to (1) is "never", and the answer to (2) is "yes". > > I agree (1) never gives you anything, even though it does not hurt, > and (2) is "meh". Okay, let's drop this series then. Thanks for pointing out my mix-up on the rebase --no-ff thing in the other email.
