git wdiff "MyDocument.docx" returns 'binary files a/MyDocument.docx and b/MyDocument.docx differ'

git wdiff "MyDocument.docx" returns 'binary files a/MyDocument.docx and b/MyDocument.docx differ'

[John Zajac]

[-- 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 --]

Re: git wdiff "MyDocument.docx" returns 'binary files a/MyDocument.docx and b/MyDocument.docx differ'

[J]

[-- Attachment #1.1: Type: text/plain, Size: 1432 bytes --]

Use wdiff instead of diff.

On Wednesday, January 17, 2018 at 1:35:59 AM UTC+8, John Zajac wrote:
>
> 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/021650e6-8161-4a0c-8608-df2a39249063%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[-- Attachment #1.2: Type: text/html, Size: 3262 bytes --]