From: Jeff King <peff@peff.net>
Date: Thu, 18 Feb 2010 20:37:38 GMT
Subject: Re: How to create patches for a merge?
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