* are X-like merges bad?
@ 2011-11-16 8:20 Ilya Basin
0 siblings, 0 replies; only message in thread
From: Ilya Basin @ 2011-11-16 8:20 UTC (permalink / raw)
To: git
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.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-11-16 8:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-16 8:20 are X-like merges bad? Ilya Basin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).