From: Ilya Basin <basinilya@gmail.com>
To: git@vger.kernel.org
Subject: are X-like merges bad?
Date: Wed, 16 Nov 2011 12:20:09 +0400 [thread overview]
Message-ID: <972241491.20111116122009@gmail.com> (raw)
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.
reply other threads:[~2011-11-16 8:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=972241491.20111116122009@gmail.com \
--to=basinilya@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.