From: Matthias Baumgarten Date: Wed, 21 Jul 2021 19:18:38 GMT Subject: Re: [PATCH v2 4/8] pull: since --ff-only overrides, handle it first Message-ID: <5f334459-26ef-6bf6-d72e-31564b10cd2c@aixigo.com> In-Reply-To: <1a821d3b1ddf22b62b14d3b573015c3d8c90e2de.1626831744.git.gitgitgadget@gmail.com> On 7/21/21 3:42 AM, Elijah Newren via GitGitGadget wrote: > There are both merge and rebase branches in the logic, and previously > both had to handle fast-forwarding. Merge handled that implicitly > (because git merge handles it directly), while in rebase it was > explicit. Given that the --ff-only flag is meant to override any > --rebase or --no-rebase, make the code reflect that by handling > --ff-only before the merge-vs-rebase logic. Great. That now will work as I would expect it to. -- aixigo AG Karl-Friedrich-Str. 68, 52072 Aachen, Germany phone: +49 (0)241 559709-390, fax: +49 (0)241 559709-99 email: matthias.baumgarten@aixigo.com web: https://www.aixigo.com District Court Aachen – HRB 8057 Board: Christian Friedrich, Tobias Haustein Chairman of the Supervisory Board: Dr. Roland Schlager