From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 May 2012 22:18:08 GMT
Subject: Re: 'git merge tag' not working as before
Message-ID: <7vfwahxqhr.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAMP44s1bry3=W8hJPP9mJLzHmXFZug58aimGHhCSzwS9+Q-yWw@mail.gmail.com>

Felipe Contreras <felipe.contreras@gmail.com> writes:

> I used to do things like 'git merge v1.7.10.3' (from v1.7.10.2) but
> even though it's ff it tries to create a merge commit.
>
> Seems like now I have to run 'git merge v1.7.10.3^0', I don't see why
> that would be desirable.
>
> I think this is a bug and a regression.

It was a deliberate feature enhancement a few releases back, IIRC.

You should be able to say "git merge --ff-only v1.7.10.3" as well.