Linus Torvalds writes: (Summary) On Tue, Feb 13, 2018 at 9:18 AM, Junio C Hamano <gitster@pobox.com> Yes, that sounds like the right thing to do.
Oooh. Yes, that sounds like the right thing to do.
So the "no fast-forward" logic would trigger only if the name we used
Oooh. Yes, that sounds like the right thing to do.
So the "no fast-forward" logic would trigger only if the name we used
for merging is one of the temporary ones (ie .git/{FETCH,MERGE}_HEAD),
not if the mentioned tag is already a normal tag reference.
I'd still have to teach people to use "--only-ff" if they don't do the
"fetch and merge" model but literally just do "git pull upstream
vX.Y", but at least the case Mauro describes would automatically just
DTRT.