git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: John Tapsell <johnflux@gmail.com>
To: "Dr. Lars Hanke" <lars@lhanke.de>
Cc: git@vger.kernel.org
Subject: Re: Diffing M$-Word
Date: Tue, 4 Aug 2009 20:10:31 +0300	[thread overview]
Message-ID: <43d8ce650908041010w1ffa3040m4b783fc0d347818e@mail.gmail.com> (raw)
In-Reply-To: <4A7869BD.5010209@lhanke.de>

2009/8/4 Dr. Lars Hanke <lars@lhanke.de>:
> At work I have to write a lot of reports using M$-Word and found that git is
> capable of managing these in an easy and meaningful way. However, diffing of
> course does not work. I checked the web for solutions, but somehow, I did
> not hit the correct search pattern.

With the openoffice format, .odt, the file is just a zip file that you
can unzip either manually or with a commit hook (and rezip with a
checkout hook).

I think Microsoft's format .docx could do something similar.

That sort of diff will help git do it's job properly (e.g. you can
then see when a particular image has changed etc), but not useful for
a human to view.

I think a way to specify a difftool based on extension would certainly
be useful.  Then distros could provide default useful difftools (for
comparing images, etc)

John

  parent reply	other threads:[~2009-08-04 17:10 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-29 20:16 External Diff Tool Eric Stegemoller
2009-07-29 20:45 ` Bert Wesarg
2009-07-30 19:22   ` Eric Stegemoller
2009-07-31 10:18     ` Johannes Schindelin
2009-08-01 11:12     ` David Aguilar
2009-08-04 14:12       ` Eric Stegemoller
2009-08-04 17:02         ` Diffing M$-Word Dr. Lars Hanke
2009-08-04 17:10           ` Matthieu Moy
2009-08-04 17:10           ` John Tapsell [this message]
2009-08-04 19:31           ` Johannes Sixt
2009-08-05 19:35             ` Dr. Lars Hanke

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=43d8ce650908041010w1ffa3040m4b783fc0d347818e@mail.gmail.com \
    --to=johnflux@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=lars@lhanke.de \
    /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).