On Tue, May 17, 2011 at 18:17, Peter Maydell wrote: > On 17 May 2011 22:10, Mike Frysinger wrote: >> --- a/.gitignore >> +++ b/.gitignore >> @@ -58,6 +58,10 @@ QMP/qmp-commands.txt >> *.orig >> .pc >> patches >> +*.diff >> +*.patch >> +*.rej >> +*.orig >> pc-bios/bios-pq/status >> pc-bios/vgabios-pq/status >> pc-bios/optionrom/linuxboot.bin > > Er, *.orig is already in .gitignore, you can see it in > the context here...
yes, this patch was written before that .orig entry > Also I tend to agree with the argument made by Stefan Weil > in the final comment on this patch: > http://patchwork.ozlabs.org/patch/84320/ > qemu's .gitignore should contain only entries specific to qemu > (files created by running makefile targets and the like); > generic things like .diff/.patch/.rej should be in your > local git config instead. using that logic, quite a few entries shouldn't be in .gitignore. like the "*.orig" you already quoted. and the patch you refer to was merged. -mike
