Den Tuesday 25 March 2008 19.25.58 skrev Joe Fiorini: > I am trying to generate a diff patch on my local dev box. I want to > upload this patch to a server (running Windows Server 2008) and apply > it to my staging code. The catch is: I cannot install git on the > server to accept the patch. Therefore, I would like to use a generic > patching tool (such as patch from the GnuWin32 tools). I tried > generating a unified diff with the following command: > > git diff -U > diff.patch > > and then tried to apply it using: > > patch -u -i ..\other_dir\diff.patch You can try git-apply instead of patch. It is a bit smarter (and not outsmarting itself either). -- robin -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html