qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: Gerhard Wiesinger <lists@wiesinger.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 2/2 V1] Fixed EPROM for AMD driver compatibility under DOS with Netware driver
Date: Wed, 23 Feb 2011 18:25:36 +0000	[thread overview]
Message-ID: <AANLkTikW0rX6JUrZFL8Wv2y81bKWzW+yxKeOsqa3cM+K@mail.gmail.com> (raw)
In-Reply-To: <alpine.LFD.2.02.1102231904480.28972@bbs.intern>

On 23 February 2011 18:06, Gerhard Wiesinger <lists@wiesinger.com> wrote:
> I'm not a git expert. Can you explain how to merge 3 commit to one output as
> expected?

There are a number of ways to do it. I use stgit (http://www.procode.org/stgit/)
to manage my patches, but if you don't want to use a new tool I guess
the top answer here:
http://stackoverflow.com/questions/616556/how-do-you-squash-commits-into-one-patch-with-git-format-patch
is probably as good as anything else.

-- PMM

  reply	other threads:[~2011-02-23 18:25 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-20 19:53 [Qemu-devel] [PATCH 2/2 V1] Fixed EPROM for AMD driver compatibility under DOS with Netware driver Gerhard Wiesinger
2011-02-22 21:00 ` Gerhard Wiesinger
2011-02-23  8:43   ` Peter Maydell
2011-02-23 18:06     ` Gerhard Wiesinger
2011-02-23 18:25       ` Peter Maydell [this message]
2011-02-23 20:24         ` Gerhard Wiesinger
2011-03-05 12:48           ` Gerhard Wiesinger
2011-03-06 18:13             ` Andreas Färber

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=AANLkTikW0rX6JUrZFL8Wv2y81bKWzW+yxKeOsqa3cM+K@mail.gmail.com \
    --to=peter.maydell@linaro.org \
    --cc=lists@wiesinger.com \
    --cc=qemu-devel@nongnu.org \
    /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).