Re: Merging using only fast-forward

["Sverre Hvammen Johansen" <hvammen@gmail.com>]

On Jan 19, 2008 2:43 AM, Junio C Hamano <gitster@pobox.com> wrote:
> 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 am currently working on a patch for this.  I have some new tests for
this but more is needed and there is no documentation.

The only case that currently is not working is the case where I need
to fast forward head and then do a merge.  Do I need to update the
files in the working directory twice (once after the fast forward and
then once by the merge) or can I somehow get lets say
git-merge-recursive to do this part for me?

The patch I have that handles the above failing case by not fast
forwarding HEAD, but instead use it together with the other real_heads
work (all tests succeed).

-- 
Sverre Hvammen Johansen