Re: [PATCH v2 4/8] pull: since --ff-only overrides, handle it first
On 7/21/21 3:42 AM, Elijah Newren via GitGitGadget wrote:
Show 6 quoted lines
> 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