From: "Shawn O. Pearce" <spearce@spearce.org>
To: Bradley Wagner <bradley.wagner@hannonhill.com>
Cc: git@vger.kernel.org
Subject: Re: What is the scenario for a commit with 3 or more parents
Date: Wed, 28 Jul 2010 19:19:46 -0700 [thread overview]
Message-ID: <20100729021946.GG25268@spearce.org> (raw)
In-Reply-To: <AANLkTikMRa_LrD2fU9Piv3GW2H0r7Jf_9s5iM0wc9t6s@mail.gmail.com>
Bradley Wagner <bradley.wagner@hannonhill.com> wrote:
> I was reading over the Specifying Revisions section in the man entry
> gitrevisions. I understand having 2 parent commits with a merge.
>
> I was trying to understand the HEAD^2 style syntax and wondering where
> HEAD^3 would be used. From the example diagram, this would be Commit B
> but I'm unclear how this would ever happen. Is this some kind of
> multi-way merge?
Yes. Its called an octopus merge. It happpens sometimes when
merging 2 or more otherwise fairly isolated changes in a single
shot. E.g. `git merge feature-a feature-b thing-c`.
> Does git log show the parents in their ordinal order in the "Merge:" line?
Yes.
--
Shawn.
next prev parent reply other threads:[~2010-07-29 2:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-29 2:05 What is the scenario for a commit with 3 or more parents Bradley Wagner
2010-07-29 2:19 ` Shawn O. Pearce [this message]
2010-07-29 17:55 ` Sverre Rabbelier
2010-07-29 17:57 ` Bradley Wagner
2010-07-29 18:10 ` Joshua Juran
2010-07-29 18:22 ` Sverre Rabbelier
2010-07-29 20:12 ` Junio C Hamano
2010-07-29 20:50 ` Sverre Rabbelier
2010-07-29 21:01 ` Junio C Hamano
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=20100729021946.GG25268@spearce.org \
--to=spearce@spearce.org \
--cc=bradley.wagner@hannonhill.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 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).