{"thread":{"id":"28944","subject":"are X-like merges bad?","startedAt":"2011-11-16T08:20:09Z","lastAt":"2011-11-16T08:20:09Z","messageCount":1,"participants":["Ilya Basin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"179568","messageId":"972241491.20111116122009@gmail.com","threadId":"28944","inReplyTo":null,"subject":"are X-like merges bad?","fromName":"Ilya Basin","fromEmail":"basinilya@gmail.com","sentAt":"2011-11-16T08:20:09Z","receivedAt":"2011-11-16T08:20:09Z","isPatch":false,"sender":{"key":"basinilya@gmail.com","avatar":null},"body":"When you merge branch A with branch B, you can then fast forward\nbranch B to the merge commit. git merge even does this automatically.\nSuch commits have 2 parents and 2 children.\n\nOn both branches 'git log --first-parent' shows the same history\nbefore the merge.\n\nIs it true that in this case you can't filter commits by branch name\nin 'git log'?\n\nI'm thinking of using 'git merge --no-ff' since now.\n"}]}