From mboxrd@z Thu Jan  1 00:00:00 1970
From: Eric Schulte <schulte.eric@gmail.com>
Subject: Re: Org, Diffs, and Version Control
Date: Sun, 16 Oct 2011 09:25:39 -0600
Message-ID: <87hb395570.fsf@gmail.com>
References: <m2d3dx109v.fsf@pluto.luannocracy.com> <87pqhxng5f.fsf@norang.ca>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([140.186.70.92]:47660)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <schulte.eric@gmail.com>) id 1RFSay-0000lG-Dw
	for emacs-orgmode@gnu.org; Sun, 16 Oct 2011 11:25:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <schulte.eric@gmail.com>) id 1RFSaw-00068P-VH
	for emacs-orgmode@gnu.org; Sun, 16 Oct 2011 11:25:48 -0400
Received: from mail-gx0-f169.google.com ([209.85.161.169]:63222)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <schulte.eric@gmail.com>) id 1RFSaw-00068K-Qx
	for emacs-orgmode@gnu.org; Sun, 16 Oct 2011 11:25:46 -0400
Received: by ggdk5 with SMTP id k5so2717336ggd.0
	for <emacs-orgmode@gnu.org>; Sun, 16 Oct 2011 08:25:46 -0700 (PDT)
In-Reply-To: <87pqhxng5f.fsf@norang.ca> (Bernt Hansen's message of "Sun, 16
	Oct 2011 10:51:40 -0400")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Bernt Hansen <bernt@norang.ca>
Cc: Dave Abrahams <dave@boostpro.com>, emacs-orgmode@gnu.org

>> Hints most appreciated,
>
> The main thing I do is use org-indent-mode so indentation is not a
> factor in the diffs.  Everything starts at column 1 and moving things
> around and promoting headlines doesn't change the indent of the items.
>

I also always start my subtree content at column 1 (I never indent whole
section bodies) and I think this helps promote saner diffs and generally
encourages better Org-mode behavior.

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

-- 
Eric Schulte
http://cs.unm.edu/~eschulte/