From: Matthias Baumgarten Date: Fri, 23 Jul 2021 09:36:30 GMT Subject: Re: pull.rebase config vs. --ff-only on command line Message-ID: In-Reply-To: On 7/22/21 8:57 PM, Junio C Hamano wrote: >> * git -c pull.ff=only pull, do a fast-forward (or merge) > > This should fast-forward if it can or otherwise fail if it cannot, > right? Yes, I should not have written "... (or merge)". >> * git -c pull.ff=only pull --merge, force a merge commit > > This would fast-forward if it can or otherwise create a merge. > Unlike "pull --no-ff", this should not "force" a merge commit. Ack. I.e. it should work like "git merge" would by default. >> * git -c pull.ff=only pull --rebase, force rebase > > This would rebase (we may not have our own commits on top of theirs, > in which case it would end up fast-forwarding plus rebasing 0 > commits). Yes. Again, this should and would behave like e.g. "git rebase" would if I were to rebase a branch which is a few commits _behind_ the branch I rebase on top of. > I do not think the phrase "force rebase" makes much sense, though. Agree. -- 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