|
From: | Gerhard Wiesinger |
Subject: | Re: [Qemu-devel] [PATCH 2/2 V1] Fixed EPROM for AMD driver compatibility under DOS with Netware driver |
Date: | Sat, 5 Mar 2011 13:48:04 +0100 (CET) |
User-agent: | Alpine 2.02 (LFD 1266 2009-07-14) |
On Wed, 23 Feb 2011, Gerhard Wiesinger wrote:
On Wed, 23 Feb 2011, Peter Maydell wrote:On 23 February 2011 18:06, Gerhard Wiesinger <address@hidden> wrote:I'm not a git expert. Can you explain how to merge 3 commit to one output asexpected?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.Thanx for your help, resent the patch.
For newbies for documentation how to submit a qemu patch made of several commits (updated for necessary signoff):
# Last commit before patch git branch pcnet-amd-fix 1899e4afdc2d838be5625539df9c87cca49bdd70 git checkout pcnet-amd-fix git merge --squash master git commit -a -F - <<EOF hw/pcnet.c: Fix EPROM contents to suit AMD netware drivers bugfix under DOS for AMD netware driver: AMD PCNTNW Ethernet MLID v3.10 (960115), network card not found bugfix works well under DOS with: 1.) AMD NDIS driver v2.0.1 2.) AMD PCNTNW Ethernet MLID v3.10 (960115) 3.) Knoppix 6.2 EOF # Signoff must be added git format-patch -s master git checkout master Ciao, Gerhard -- http://www.wiesinger.com/
[Prev in Thread] | Current Thread | [Next in Thread] |