Manish <mailtomanish.sha...@gmail.com> wrote: > Hello Andrew, > > I copied the diff from "---" to the version number at the end of the > diff to a file and ran a "git apply <patch file>" while on a local > branch. It fails with "fatal: corrupt patch at line 12" which is: > > ,---- > | @cindex timestamp, with repeater interval > `---- > > Any clues what I could be doing wrong? >
Don't edit the message file: ``git apply'' and ``git am'' are perfectly capable of stripping out the irrelevant stuf. I did $ git checkout -b foo master to create a ``foo'' branch and then $ git am ~/Mail/org/25794 Applying: Apply patch for hour/minute repeater support (that's the file that contains Andrew's mail message - no editing involved). As you can see, it worked without a hitch. HTH, Nick _______________________________________________ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
