Christian Moe <m...@christianmoe.com> writes: > Hi, > > I'd love to try it out, but I'm not good at git. Would someone be kind > enough to post directions? > > I thought this would do it: > > git checkout 3d802 > git checkout -b ooo > git apply > ../0001-Re-implement-org-export-as-html-and-add-support-for-.patch > > But I got: > > error: patch failed: lisp/org.el:8711 > error: lisp/org.el: patch does not apply
One of the reasons the patch fails to apply is because I have hand edited it and removed the hunks that correspond to new files (all org-odt related). In my experience, `git apply' is quite intelligent in figuring out that the patch has been tampered with. May be you should try plain old patch utility. #+begin_src sh patch < my.patch #+end_src should provide a good starting point. It is likely to ask some questions just answer them. As noted previously, I have stripped off all the odt related changes from the patch I circulated. The patching route is recommended for existing html users. The checkout route is recommended for html + odt users. Jambunathan K.