From: Erik Faye-Lund <kusmabite@googlemail.com>
To: richardpreen@hotmail.com
Cc: msysgit@googlegroups.com, Git Mailing List <git@vger.kernel.org>
Subject: Re: [msysGit] Problem with apply
Date: Thu, 31 Dec 2009 13:49:57 +0100 [thread overview]
Message-ID: <40aa078e0912310449g4d503ba7t612e532f5069051f@mail.gmail.com> (raw)
In-Reply-To: <SNT131-ds16B1679EFC8F74B62D4630C4780@phx.gbl>
This isn't a Windows specific question, and would be better for the
main git mailing list. I'm CC'ing it in hope that someone there knows
the answer.
On Thu, Dec 31, 2009 at 1:26 PM, <richardpreen@hotmail.com> wrote:
> I'm trying to use git to create a binary diff of two files and then apply
> the diff to the first file in an attempt to make both files the same (just
> testing the concept);
>
> git diff --binary --no-index original\t1.ppt modified\t1.ppt >
> original\my.diff
> cd original
> git apply my.diff
>
> This is giving me the following error message;
> fatal: git diff header lacks filename information (line 3)
>
> Any suggestions as to where I've gone wrong?
> Thanks.
--
Erik "kusma" Faye-Lund
parent reply other threads:[~2009-12-31 12:50 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <SNT131-ds16B1679EFC8F74B62D4630C4780@phx.gbl>]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=40aa078e0912310449g4d503ba7t612e532f5069051f@mail.gmail.com \
--to=kusmabite@googlemail.com \
--cc=git@vger.kernel.org \
--cc=kusmabite@gmail.com \
--cc=msysgit@googlegroups.com \
--cc=richardpreen@hotmail.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.
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 NNTP newsgroup(s).