git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: 'git merge tag' not working as before

From
Junio C Hamano <gitster@pobox.com>
Date
May 30, 2012, 22:18 UTC
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:
Show 7 quoted lines
> 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.
Previous: Felipe ContrerasNext: Felipe Contreras
Message 2 of 3 in “'git merge tag' not working as before”
  1. Felipe ContrerasMay 30, 2012
  2. Junio C HamanoMay 30, 2012
  3. Felipe ContrerasMay 30, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.