From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.text.pandoc/21202 Path: news.gmane.org!.POSTED!not-for-mail From: J Newsgroups: gmane.text.pandoc Subject: Re: git wdiff "MyDocument.docx" returns 'binary files a/MyDocument.docx and b/MyDocument.docx differ' Date: Sat, 6 Oct 2018 01:45:22 -0700 (PDT) Message-ID: <021650e6-8161-4a0c-8608-df2a39249063@googlegroups.com> References: Reply-To: pandoc-discuss-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_974_414013972.1538815523065" X-Trace: blaine.gmane.org 1538815399 22903 195.159.176.226 (6 Oct 2018 08:43:19 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 6 Oct 2018 08:43:19 +0000 (UTC) To: pandoc-discuss Original-X-From: pandoc-discuss+bncBDMYDKFOZAOBBI7M4HOQKGQENWIPQXA-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org Sat Oct 06 10:43:15 2018 Return-path: Envelope-to: gtp-pandoc-discuss@m.gmane.org Original-Received: from mail-ot1-f59.google.com ([209.85.210.59]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g8iB8-0005rp-0R for gtp-pandoc-discuss@m.gmane.org; Sat, 06 Oct 2018 10:43:14 +0200 Original-Received: by mail-ot1-f59.google.com with SMTP id k18-v6sf10996876otl.16 for ; Sat, 06 Oct 2018 01:45:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:date:from:to:message-id:in-reply-to:references:subject :mime-version:x-original-sender:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:list-subscribe :list-unsubscribe; bh=P3hu9KC8Pb+6iuat5W5ENTgVqy1fb7zqtzE3wetxB7I=; b=kA4d9jeF1bWCjMVKSK5nBaUqRaOatznPh1cqmrs28bU2zx23KBdhqm3rauTE3MNVk4 l9uR9NoaFZ/YJTGae2N9OBz1rrSvo3zwWhsTRTDLDaq9An06AeMpRUBne7BnqYp5nUCd pTFkQ/4s1zyB3g/m1xXjPksmUzAMo4fONnaaNV3MlwiLiUl0w9KLJxMvvH25xoyPhAOo gkwJo1AVC9UZ6JgOE4K76ELQsti+o2HP+BHCSk1JZBNMsD+9EyAm7Ol45EtPSbELe2i7 0uwD9T9DNCvhbSsccrm1/7gBGdkwEcm+cC3l6JS+li/b6ql8SpLw1sfcSP1QeTzV+EMx 5TfQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:message-id:in-reply-to:references:subject:mime-version :x-original-sender:reply-to:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=P3hu9KC8Pb+6iuat5W5ENTgVqy1fb7zqtzE3wetxB7I=; b=PBRqK8N62Awdi8ymvtLOLmm0Q8lRExXFFy3DUTtezXHvHXt5+qCJgJ+tBhhoH3wzGy O/bVnu/EP43+vu3nhxxLkF8XhNLGYnjMlsFf00MSZcW2+nOgPKMaEVIwI29Xh533z9EI lqamOt8vZ57qUpCyhak42DQGO7U6/1kDuT3oo+1JZng/UA4rd0N8rmzgM3279m3mLD5P bUSJ0WQK7w2BeTFZwnKYl/R02pAMwVam1Af3ZaRp8wWGTZ2QZernCEmlOhKHmOKAWIKa 97fZiZQj9QKooGyNzslY8+nrQPsqDz6oSSNkbe+FTrbZi12vGFdTFVlWYJNdD9d2ss3W PksQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:date:from:to:message-id:in-reply-to :references:subject:mime-version:x-original-sender:reply-to :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=P3hu9KC8Pb+6iuat5W5ENTgVqy1fb7zqtzE3wetxB7I=; b=IPoM9cQFyHxp1szRkL+FEMiEqkmY2iT0BUU7kGxd1QnffgHtETbDuNyBkckAL0VMro eb/XDiRV6UXgkiiHTM7bnWoaAVDwQv6qkMaQKvFX/eETL1Zw9ddFf7XlJ6iOyRBnavpG BMIxNoLmMDty2V69Ia9ei+ypFrm4U9+LSQecsdfrMBEIxSy/Pj56HyG95Hy1DOAMkyiD LChuJWyyMrpL4YDpvCTDBLhIzhnJwC++9OqmBa8xK2Vr27sw2Uw1aTou0a9NpTbZLX3k 1XIy/lYXnOvdKpdEl8rmMnZwixWHIl47FTldIjJIsJeGgm5VdPIMNXKw1bGSnpnNhuyz TkPw== Original-Sender: pandoc-discuss-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org X-Gm-Message-State: ABuFfogqWyFABT7yP1+hLOBMBkBK+W+Ckvl9aALJXmRm9Qe5Ro0RFpNO W2a5I5LWi1Bsq9dRGarwcNk= X-Google-Smtp-Source: ACcGV63oV7oRPyQUDb2SaOPAPdFQb2zIZBPuKvtb5GvhV5nMRhl0dSN/ifCVCnb5JgXPvl24Z8NDJw== X-Received: by 2002:a9d:528e:: with SMTP id f14mr45986oth.4.1538815524474; Sat, 06 Oct 2018 01:45:24 -0700 (PDT) X-BeenThere: pandoc-discuss-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org Original-Received: by 2002:aca:cc96:: with SMTP id c144-v6ls6493088oig.13.gmail; Sat, 06 Oct 2018 01:45:23 -0700 (PDT) X-Received: by 2002:aca:4995:: with SMTP id w143-v6mr238608oia.7.1538815523663; Sat, 06 Oct 2018 01:45:23 -0700 (PDT) In-Reply-To: X-Original-Sender: lixichen-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Precedence: list Mailing-list: list pandoc-discuss-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org; contact pandoc-discuss+owners-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org List-ID: X-Spam-Checked-In-Group: pandoc-discuss-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org X-Google-Group-Id: 1007024079513 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Xref: news.gmane.org gmane.text.pandoc:21202 Archived-At: ------=_Part_974_414013972.1538815523065 Content-Type: multipart/alternative; boundary="----=_Part_975_1595054053.1538815523066" ------=_Part_975_1595054053.1538815523066 Content-Type: text/plain; charset="UTF-8" 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 > 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. ------=_Part_975_1595054053.1538815523066 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
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=C2=A0however a= ll I get is:=C2=A0

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=C2=A0

git wdiff "MyDocument.docx&q= uot;
=C2=A0

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 r= oot of my git REPO (not 'project', whatever that is in a git contex= t).


Any help on where I went wrong? I'm certain I have my u= ser .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 &= quot;pandoc-discuss" group.
To unsubscribe from this group and stop receiving emails from it, send an e= mail to pand= oc-discuss+unsubscribe-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org.
To post to this group, send email to pandoc-discuss-/JYPxA39Uh5TLH3MbocFFw@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.co= m.
For more options, visit http= s://groups.google.com/d/optout.
------=_Part_975_1595054053.1538815523066-- ------=_Part_974_414013972.1538815523065--