From: Alex Riesen <raa.lkml@gmail.com>
To: Tay Ray Chuan <rctay89@gmail.com>
Cc: Michael Poole <mdpoole@troilus.org>,
John Tapsell <johnflux@gmail.com>, Jeff King <peff@peff.net>,
Git List <git@vger.kernel.org>
Subject: Re: Groups of commits
Date: Wed, 28 Apr 2010 10:05:39 +0200 [thread overview]
Message-ID: <y2t81b0412b1004280105p46962bdeq163bc4fb92cb0fdb@mail.gmail.com> (raw)
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".
next prev parent reply other threads:[~2010-04-28 8:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-28 1:59 Groups of commits John Tapsell
2010-04-28 2:14 ` Jeff King
2010-04-28 2:15 ` Michael Poole
2010-04-28 5:25 ` Tay Ray Chuan
2010-04-28 8:05 ` Alex Riesen [this message]
2010-04-28 12:46 ` Avery Pennarun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=y2t81b0412b1004280105p46962bdeq163bc4fb92cb0fdb@mail.gmail.com \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=johnflux@gmail.com \
--cc=mdpoole@troilus.org \
--cc=peff@peff.net \
--cc=rctay89@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).