Re: Merging using only fast-forward

From: Sverre Hvammen Johansen <hvammen@gmail.com>
Date: Jan 19, 2008, 12:30 UTC
Message-ID: <402c10cd0801190430y7d3253c9ue36ce4e6647c6f0d@mail.gmail.com>
In-Reply-To: <402c10cd0801190427o62493073s408959aa5701ca86@mail.gmail.com>

On Jan 19, 2008 2:43 AM, Junio C Hamano <gitster@pobox.com> wrote:

Show 8 quoted lines

> At one end of the spectrum, we have these crazy people who want
> git to record something that is not a merge at all as a merge
> with --no-ff.  At the other end of the spectrum, we have these
> other crazy people who want git to outsmart them by allowing
> them to throw random set of commits as potential parents,
> remove duplicates and figure out how many real parents the
> resulting merge should have (including the case that it may not
> even have any).

I guess the most common use case would be where you have at least
three developers and they randomly fetch and merge between each other.
 They usually are not aware of where each other are and everyone
avoids octopus.  They end up with more merge commits than needed
simply because they sometime pick the wrong order.  If they instead
had git find the real parents they would get fewer merge commits.

-- 
Sverre Hvammen Johansen