git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Groups of commits

From
Alex Riesen <raa.lkml@gmail.com>
Date
Apr 28, 2010, 08:05 UTC
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:
Show 6 quoted lines
> 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".

Previous: Tay Ray ChuanNext: Avery Pennarun
Message 5 of 6 in “Groups of commits”
  1. John TapsellApr 28, 2010
  2. Jeff KingApr 28, 2010
  3. Michael PooleApr 28, 2010
  4. Tay Ray ChuanApr 28, 2010
  5. Alex RiesenApr 28, 2010
  6. Avery PennarunApr 28, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.