From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Doug Ireton <dougireton@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: How can I get full filenames from Git difftool (for Microsoft Word “Compare Documents” feature)?
Date: Mon, 14 Dec 2009 08:55:53 +0100 [thread overview]
Message-ID: <vpqd42i56ra.fsf@bauges.imag.fr> (raw)
In-Reply-To: <b507cb050912132225j1bdc39c2v42a3bf6bddf1cb1a@mail.gmail.com> (Doug Ireton's message of "Sun\, 13 Dec 2009 22\:25\:30 -0800")
Doug Ireton <dougireton@gmail.com> writes:
> I am using the latest version of Git (1.6.6) on a Mac. My wife wants
> to use Git to manage her fiction writing as long as she can still use
> Microsoft Word 2008 (Mac). Instead of pushing her into saving
> everything as plain text, I would like to use Git Difftool to pass the
> files to Word and use Word's Compare Documents feature. She wouldn't
> be able to use Git Diff since Word docs are binary files but she could
> still use Git Difftool.
If you're interested in diff-ing the _text_ itself, you can use the
textconv filter of Git, together with antiword (or catdoc, which does
the same thing, but I think antiword works better).
See this:
http://git.or.cz/gitwiki/GitTips#HowtousegittotrackOpenDocument.28OpenOffice.2CKoffice.29files.3F
and adapt by replacing "OpenOffice" with MS Word, and odt2txt with
antiword.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2009-12-14 7:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <b507cb050912132222x7e1daa9cw73b13f3db0ee22c6@mail.gmail.com>
2009-12-14 6:25 ` How can I get full filenames from Git difftool (for Microsoft Word “Compare Documents” feature)? Doug Ireton
2009-12-14 7:55 ` Matthieu Moy [this message]
2009-12-14 13:11 ` Jeff Epler
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpqd42i56ra.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=dougireton@gmail.com \
--cc=git@vger.kernel.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.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).