On Thu, Sep 08, 2005 at 04:25:35PM -0700, Greg KH wrote: > Ick. I'm trying to apply a bunch of patches to a git repo (the kernel > tree), using 'git applymbox' and it's just dieing on simple patches that > apply with fuzz.
Ok, found another one. This time I looked at the patch itself, and it is a bit "odd", but normal patch handles it fine. The patch is: --- gregkh-2.6.orig/drivers/usb/input/Makefile 2005-08-15 23:39:10.000000000 -0700 +++ gregkh-2.6/drivers/usb/input/Makefile 2005-08-16 12:31:54.000000000 -0700 @@ -39,5 +39,6 @@ obj-$(CONFIG_USB_POWERMATE) += powermate.o obj-$(CONFIG_USB_WACOM) += wacom.o obj-$(CONFIG_USB_ACECAD) += acecad.o +obj-$(CONFIG_USB_YEALINK) += yealink.o obj-$(CONFIG_USB_XPAD) += xpad.o obj-$(CONFIG_USB_APPLETOUCH) += appletouch.o While the original drivers/usb/input/Makefile in this area is: obj-$(CONFIG_USB_POWERMATE) += powermate.o obj-$(CONFIG_USB_WACOM) += wacom.o obj-$(CONFIG_USB_ACECAD) += acecad.o obj-$(CONFIG_USB_XPAD) += xpad.o (ignore tab issues, this was cut-and-pasted). So, the patch shows that there was another line at the end of the file, while in reality it isn't (this is due to me excluding a patch from the series that I'm applying due to other reasons.) Is this something that git can handle without me editing the patch by hand? :) thanks, greg k-h - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html