Re: [RFC/PATCH] Fast forward strategies only, common, fork and path

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

On Feb 3, 2008 4:54 PM, Sverre Hvammen Johansen <hvammen@gmail.com> wrote:
> This patch also uses the real heads found instead of those
> specified for real merges.  This means that merge startegies
> that only take two heads can now accept more than two heads
> if they can be reduced down to only two real heads.  However,
> fast-forward of head in combination with a real merge is
> handled as before.

I intend to also submit a patch that does fast forward in combination
with a real merge.  This means that some case can be reduced down to
only two real parents and we can select a  twohead strategy instead of
an octopus strategy.  In cases where we have at least three real
parents there is no point in doing this.  We only need to specify the
fast forwarded head right after head to allow git-merge-octopus to do
its best.

I need some advise how to implement fast-forward in combination with a
real merge.  I know how to do this with an update of the directory
tree and the index with the fast forward before the real merge is
done.  But, how canweI do this without updating the directory tree
with the fast forward?  Or is it OK to always update the directory
with the intermediate state we get from the fast forward?

> --
> Sverre Hvammen Johansen
>



-- 
Sverre Hvammen Johansen