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

Re: How to create patches for a merge?

From
Jeff King <peff@peff.net>
Date
Feb 18, 2010, 20:37 UTC
Message-ID
<20100218203738.GB8110@coredump.intra.peff.net>
In-Reply-To
<83d7aaa41002180340p2f9b7241h9c220b84ec5dd1d@mail.gmail.com>
On Thu, Feb 18, 2010 at 03:40:07AM -0800, Geoffrey Lee wrote:
> When I use "git format-patch", it doesn't seem to include merges. How
> can I perform a merge and then e-mail it to someone as a set of
> patches?

Is it important that it be patches, or simply that it go over email? In the latter case, you can use "git bundle" to create a set of commits, including merges, and send them to the remote.

-Peff
Previous: Junio C HamanoNext: Geoffrey Lee
Message 3 of 5 in “How to create patches for a merge?”
  1. Geoffrey LeeFeb 18, 2010
  2. Junio C HamanoFeb 18, 2010
  3. Jeff KingFeb 18, 2010
  4. Geoffrey LeeFeb 19, 2010
  5. Clemens BuchacherFeb 20, 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.