Re: can a git commit have more than two parents?

["Robert P. J. Day" <rpjday@xxxxxxxxxxxxxx>]

On Sat, 3 Nov 2007, Rene Herman wrote:

> On 11/02/2007 09:13 AM, Robert P. J. Day wrote:
>
> >   reading the git user manual, and i'm curious about the phrasing that
> > a commit might have more than one parent if that commit represents a
> > merge.  sure, it's obvious that it would have *two* parents, but why
> > doesn't the text just say that?  can there be *more* than two parents
> > for a commit operation?  or for any other operation?  thanks.
>
> Sure. It's not the kind of thing you tend to run into during
> light/regular use I guess, but see "git merge --help". A merge can
> merge any number of "remotes" and this creates a commit with as many
> parents.

yes, i noticed that only minutes after posting when i skimmed the log
and saw multi-merge commits.  time to keep reading.

rday
-- 
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA

http://crashcourse.ca
========================================================================

--
To unsubscribe from this list: send an email with
"unsubscribe kernelnewbies" to ecartis@xxxxxxxxxxxx
Please read the FAQ at http://kernelnewbies.org/FAQ