From: Michael Dressel <michaeltilodressel@t-online.de>
Date: Thu, 13 Dec 2007 21:28:30 GMT
Subject: Re: git merge --no-commit <branch>; does commit
Message-ID: <alpine.LSU.0.99999.0712132224280.5606@castor.milkiway.cos>
In-Reply-To: <81b0412b0712131319h63609810m593f0e552d02a83c@mail.gmail.com>



On Thu, 13 Dec 2007, Alex Riesen 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.
>

It looks like I misunderstood the meaning of --no-commit. I have 
to use --squash in this case.

Cheers,
Michael