From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 15 Jul 2021 09:44:15 GMT
Subject: RE: [PATCH 3/5] pull: handle conflicting rebase/merge options via last option wins
Message-ID: <60f0036fa3c97_2e67208c3@natae.notmuch>
In-Reply-To: <3c07ce978caa832b08c6bef1c48c061e41a6fd0b.1626316849.git.gitgitgadget@gmail.com>

Elijah Newren via GitGitGadget wrote:
> From: Elijah Newren <newren@gmail.com>
> 
> 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