threads / discuss / 28944

are X-like merges bad?

Subject: are X-like merges bad?

## tl;dr

One message between Nov 16, 2011 and Nov 16, 2011.

replies: 0people: 1as markdown or json

Ilya Basin· Nov 16, 2011, 08:20 UTC · lore

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.

$ 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.