git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Geoffrey Lee <geoffreyj.lee@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: How to create patches for a merge?
Date: Fri, 19 Feb 2010 02:25:14 -0800	[thread overview]
Message-ID: <83d7aaa41002190225o3255248re1581a86e1346f28@mail.gmail.com> (raw)
In-Reply-To: <20100218203738.GB8110@coredump.intra.peff.net>

On Thu, Feb 18, 2010 at 12:37 PM, Jeff King <peff@peff.net> wrote:
> 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.

I was not aware of "git bundle". That does exactly what I need. Thanks!

-Geoffrey Lee

  reply	other threads:[~2010-02-19 10:25 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-18 11:40 How to create patches for a merge? Geoffrey Lee
2010-02-18 18:10 ` Junio C Hamano
2010-02-18 20:37 ` Jeff King
2010-02-19 10:25   ` Geoffrey Lee [this message]
2010-02-20 17:39     ` Clemens Buchacher

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=83d7aaa41002190225o3255248re1581a86e1346f28@mail.gmail.com \
    --to=geoffreyj.lee@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    /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).