From: Nick Dokos <nicholas.dokos@hp.com>
To: Manish <mailtomanish.sharma@gmail.com>
Cc: "Andrew J. Korty" <ajk@iu.edu>,
nicholas.dokos@hp.com, emacs-orgmode@gnu.org,
Carsten Dominik <carsten.dominik@gmail.com>
Subject: Re: [PATCH] Apply patch for hour/minute repeater support
Date: Wed, 22 Sep 2010 03:06:59 -0400 [thread overview]
Message-ID: <17665.1285139219@gamaville.dokosmarshall.org> (raw)
In-Reply-To: Message from Manish <mailtomanish.sharma@gmail.com> of "Wed, 22 Sep 2010 10:17:12 +0530." <AANLkTi=SoT7ycJk7ufQn2TnOh8kiZTtQ9jYmEXi5yVNi@mail.gmail.com>
Manish <mailtomanish.sharma@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
next prev parent reply other threads:[~2010-09-22 7:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-14 17:06 [PATCH] Apply patch for hour/minute repeater support Andrew J. Korty
2010-09-15 16:10 ` Martin Pohlack
2010-09-15 23:58 ` Andrew J. Korty
2010-09-21 12:46 ` Carsten Dominik
2010-09-22 4:47 ` Manish
2010-09-22 7:06 ` Nick Dokos [this message]
2010-10-24 16:39 ` Carsten Dominik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=17665.1285139219@gamaville.dokosmarshall.org \
--to=nicholas.dokos@hp.com \
--cc=ajk@iu.edu \
--cc=carsten.dominik@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=mailtomanish.sharma@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).