From: Jakub Narebski <jnareb@gmail.com>
To: Shawn Ligocki <sligocki@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Merge made by recursive?
Date: Wed, 25 May 2011 11:04:05 -0700 (PDT) [thread overview]
Message-ID: <m339k2zmh8.fsf@localhost.localdomain> (raw)
In-Reply-To: <loom.20110525T192418-887@post.gmane.org>
Shawn Ligocki <sligocki@gmail.com> writes:
> Is this intentionally bad grammar? Every time I see it, I cringe a little. What
> does it even mean? That it merged incrementally through each subsequent revision?
"Merge made by recursive" means "Merge made by 'recursive' merge strategy",
where 'recursive' part refers to the fact that in case of criss-cross
merge
/--*---B1---M1---*---# <-- foo
/ \ /
---B x
\ / \
\--*---B2---M2---*---# <-- bar
(you are trying to merge 'bar' into 'foo') when we have more than one
merge base, the strategy first creates synthetic merge for B1 and B2
M1---*---# <-- foo
/
X
\
M2---*---# <-- bar
and uses this X as a merge base for further merging. Or something
like that.
See "Merge strategies" section in git-merge(1) documentation.
--
Jakub Narebski
Poland
ShadeHawk on #git
next prev parent reply other threads:[~2011-05-25 18:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-25 17:28 Merge made by recursive? Shawn Ligocki
2011-05-25 17:42 ` Ramkumar Ramachandra
2011-05-25 18:04 ` Jakub Narebski [this message]
2011-05-25 19:30 ` Junio C Hamano
2011-05-25 19:50 ` Jeff King
2011-05-25 20:17 ` Junio C Hamano
2011-05-25 20:47 ` Junio C Hamano
2011-05-25 21:02 ` Jeff King
2011-05-25 21:25 ` Jeff King
2011-05-25 22:46 ` Jeff King
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=m339k2zmh8.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=sligocki@gmail.com \
/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.