emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Herbert Sitz <hesitz@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: Org, Diffs, and Version Control
Date: Sun, 16 Oct 2011 16:56:28 +0000 (UTC)	[thread overview]
Message-ID: <loom.20111016T185417-391@post.gmane.org> (raw)
In-Reply-To: 87hb395570.fsf@gmail.com

Eric Schulte <schulte.eric <at> gmail.com> writes:

> Additionally you could try the --word-diff option to git, i.e.,
>   git diff --word-diff
> or
>   git diff --word-diff=color
> which returns diffs which ignore whitespace changes and which show
> changes on the word rather than line level.  I believe it is possible to
> make this behavior default for a git repository but I've never done so
> and don't know how such a default would be specified.
> Hope this helps -- Eric

Thanks for the tip.  Here's some info that I think shows how to make --word-diff
option the default for a particular type (e.g., .org) fie:


-- Herb

  reply	other threads:[~2011-10-16 16:56 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-16 14:25 Org, Diffs, and Version Control Dave Abrahams
2011-10-16 14:51 ` Bernt Hansen
2011-10-16 15:25   ` Eric Schulte
2011-10-16 16:56     ` Herbert Sitz [this message]
2011-10-18 14:39 ` Karl Voit
  -- strict thread matches above, loose matches on Subject: below --
2011-10-17  6:55 Rustom Mody
2011-10-17  7:19 ` suvayu ali
2011-10-19 15:02 Rustom Mody

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:

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=loom.20111016T185417-391@post.gmane.org \
    --to=hesitz@gmail.com \
    --cc=emacs-orgmode@gnu.org \


* 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


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).