Re: [Qemu-devel] [PATCH 2/2 V1] Fixed EPROM for AMD driver compatibility under DOS with Netware driver

[Andreas Färber]

Am 05.03.2011 um 13:48 schrieb Gerhard Wiesinger:

> 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

# Or in short:
git checkout -b pcnet-amd-fix 1899e4afdc2d838be5625539df9c87cca49bdd70

> 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


For the record, another possible way is:

git rebase -i HEAD^^^ # rebase the last three commits:
# edit the last two lines to start with fixup (or squash)
# if you chose squash, you'll be able to edit the message immediately
git commit --amend -s # to add the SoB and edit the message if you  
didn't before
git format-patch HEAD^

Andreas