From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 13 Dec 2007 21:23:21 GMT
Subject: Re: git merge --no-commit <branch>; does commit
Message-ID: <81b0412b0712131323p7cbba402hbfe8105eb356bdc2@mail.gmail.com>
In-Reply-To: <81b0412b0712131319h63609810m593f0e552d02a83c@mail.gmail.com>

On 13/12/2007, Alex Riesen <raa.lkml@gmail.com> wrote:
> On 13/12/2007, Michael Dressel <MichaelTiloDressel@t-online.de> wrote:
> > git merge --no-commit <branch> does "create" a commit. At lesat the
> > head and index are moved to the new commit fetched from <branch>. Maybe
> > that is because git was able to do a fast forward?
>
> Yes. Because fast-forward is what it called: fast-forward.
> It does not do any commits at all.
>

If you have a very recent git, you can avoid fast-forward when merging
by running with --no-ff. It has it's problems in general case, so it is not
default (see the git ml archive for "fast-forward does not commit").