From: John Zajac <jzajac2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: pandoc-discuss <pandoc-discuss-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org>
Subject: git wdiff "MyDocument.docx" returns 'binary files a/MyDocument.docx and b/MyDocument.docx differ'
Date: Tue, 16 Jan 2018 09:35:59 -0800 (PST) [thread overview]
Message-ID: <cfece41d-a8cb-478d-8bb8-48851fe25f1f@googlegroups.com> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 1298 bytes --]
Followed steps verbatim from using-microsoft-word-with-git
<http://blog.martinfenner.org/2014/08/25/using-microsoft-word-with-git/> however
all I get is:
> diff --git a/my.docx b/my.docx
> index 2b0af6a..8aaecb6 100644
> Binary files a/my.docx and b/my.docx differ
when I run
> git wdiff "MyDocument.docx"
I have my diff tool set to pandoc using alias and .gitattributes in my
config as described above. What could I be missing? .gitattributes is at
root of my git REPO (not 'project', whatever that is in a git context).
Any help on where I went wrong? I'm certain I have my user .gitconfig set
up correctly and that it is using it. Also tried adding same to the repo's
config however same results.
Thanks!
--
You received this message because you are subscribed to the Google Groups "pandoc-discuss" group.
To unsubscribe from this group and stop receiving emails from it, send an email to pandoc-discuss+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
To post to this group, send email to pandoc-discuss-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
To view this discussion on the web visit https://groups.google.com/d/msgid/pandoc-discuss/cfece41d-a8cb-478d-8bb8-48851fe25f1f%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
[-- Attachment #1.2: Type: text/html, Size: 2707 bytes --]
next reply other threads:[~2018-01-16 17:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-16 17:35 John Zajac [this message]
[not found] ` <cfece41d-a8cb-478d-8bb8-48851fe25f1f-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org>
2018-10-06 8:45 ` J
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=cfece41d-a8cb-478d-8bb8-48851fe25f1f@googlegroups.com \
--to=jzajac2-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=pandoc-discuss-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
/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).