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

are X-like merges bad?

From
IBIlya Basin <basinilya@gmail.com>
Date
Nov 16, 2011, 08:20 UTC
Message-ID
<972241491.20111116122009@gmail.com>

When you merge branch A with branch B, you can then fast forward branch B to the merge commit. git merge even does this automatically. Such commits have 2 parents and 2 children.

On both branches 'git log --first-parent' shows the same history before the merge.

Is it true that in this case you can't filter commits by branch name in 'git log'?

I'm thinking of using 'git merge --no-ff' since now.
Message 1 of 1 in “are X-like merges bad?”
  1. Ilya BasinNov 16, 2011

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.