RE: [PATCH 3/5] pull: handle conflicting rebase/merge options via last option wins

Elijah Newren via GitGitGadget wrote:

From: Elijah Newren <redacted>

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