From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=42553 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PsJPC-0004GL-Cs
	for qemu-devel@nongnu.org; Wed, 23 Feb 2011 13:25:43 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1PsJPA-0002in-03
	for qemu-devel@nongnu.org; Wed, 23 Feb 2011 13:25:42 -0500
Received: from mail-ey0-f173.google.com ([209.85.215.173]:63895)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1PsJP9-0002iT-Rt
	for qemu-devel@nongnu.org; Wed, 23 Feb 2011 13:25:39 -0500
Received: by eyb6 with SMTP id 6so1685035eyb.4
	for <qemu-devel@nongnu.org>; Wed, 23 Feb 2011 10:25:38 -0800 (PST)
MIME-Version: 1.0
In-Reply-To: <alpine.LFD.2.02.1102231904480.28972@bbs.intern>
References: <alpine.LFD.2.02.1102202038360.26526@bbs.intern>
	<alpine.LFD.2.02.1102222159010.2912@bbs.intern>
	<AANLkTik4ujGrwSanLL1LJJU7q=PLwXSp1xdkEWGAVX9g@mail.gmail.com>
	<alpine.LFD.2.02.1102231904480.28972@bbs.intern>
Date: Wed, 23 Feb 2011 18:25:36 +0000
Message-ID: <AANLkTikW0rX6JUrZFL8Wv2y81bKWzW+yxKeOsqa3cM+K@mail.gmail.com>
Subject: Re: [Qemu-devel] [PATCH 2/2 V1] Fixed EPROM for AMD driver
	compatibility under DOS with Netware driver
From: Peter Maydell <peter.maydell@linaro.org>
Content-Type: text/plain; charset=UTF-8
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gerhard Wiesinger <lists@wiesinger.com>
Cc: qemu-devel@nongnu.org

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