Dave Abrahams dave at boostpro.com wrote:
I was wondering what other people do.
I am using http://www.mayrhofer.eu.org/dvcs-autosync for
automatically committing of changes but without activated XMPP sync
feature (so far).
The already mentioned «git diff --color-words» helps me a lot
* Dave Abrahams d...@boostpro.com wrote:
I was wondering what other people do.
I am using http://www.mayrhofer.eu.org/dvcs-autosync for
automatically committing of changes but without activated XMPP sync
feature (so far).
The already mentioned «git diff --color-words» helps me a lot when
I wonder how much is involved in using the generic org parser (which one I
am not sure) to hook into ediff??
On Mon, Oct 17, 2011 at 8:55 AM, Rustom Mody rustompm...@gmail.com wrote:
I wonder how much is involved in using the generic org parser (which one I
am not sure) to hook into ediff??
I believe you mean something like this[1] discussion? That thread
wasn't particularly conclusive.
[1]
As I've been working on a fairly large Org outline over the past few
days, I've discovered that the format is very ill-suited to management
and review by (known) version control tools, like Git. Indentation is
always changing and volatile information like tags and priorities
tends to mix with
Dave Abrahams d...@boostpro.com writes:
As I've been working on a fairly large Org outline over the past few
days, I've discovered that the format is very ill-suited to management
and review by (known) version control tools, like Git. Indentation is
always changing and volatile information
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
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
