From: Eric Schulte <schulte.eric@gmail.com>
To: Bernt Hansen <bernt@norang.ca>
Cc: Dave Abrahams <dave@boostpro.com>, emacs-orgmode@gnu.org
Subject: Re: Org, Diffs, and Version Control
Date: Sun, 16 Oct 2011 09:25:39 -0600 [thread overview]
Message-ID: <87hb395570.fsf@gmail.com> (raw)
In-Reply-To: <87pqhxng5f.fsf@norang.ca> (Bernt Hansen's message of "Sun, 16 Oct 2011 10:51:40 -0400")
>> 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/
next prev parent reply other threads:[~2011-10-16 15:25 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 [this message]
2011-10-16 16:56 ` Herbert Sitz
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:
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=87hb395570.fsf@gmail.com \
--to=schulte.eric@gmail.com \
--cc=bernt@norang.ca \
--cc=dave@boostpro.com \
--cc=emacs-orgmode@gnu.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.