From: Alex Riesen <raa.lkml@gmail.com>
Date: Wed, 28 Apr 2010 08:05:39 GMT
Subject: Re: Groups of commits
Message-ID: <y2t81b0412b1004280105p46962bdeq163bc4fb92cb0fdb@mail.gmail.com>
In-Reply-To: <r2jbe6fef0d1004272225rd61ef84axe86ba45a0b352a8@mail.gmail.com>

On Wed, Apr 28, 2010 at 07:25, Tay Ray Chuan <rctay89@gmail.com> wrote:
> Just to add to the "merge in topic branches" idea - if you find that
> the commits are trivially fast-forwardable, you can still add a short
> note/cover letter with
>
>  git merge --no-ff -m "Added in foo's work" <branch/commit>
>

Except that is not a "short note" anymore, but a full-fledged merge
commit. You forced it with "--no-ff".