Re: [O] Org, Diffs, and Version Control

2011-10-19 Thread Rustom Mody
> > Dave Abrahams 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

Re: [O] Org, Diffs, and Version Control

2011-10-18 Thread Karl Voit
* Dave Abrahams 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 examining my git hist

Re: [O] Org, Diffs, and Version Control

2011-10-17 Thread suvayu ali
On Mon, Oct 17, 2011 at 8:55 AM, Rustom Mody 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]

Re: [O] Org, Diffs, and Version Control

2011-10-16 Thread Rustom Mody
I wonder how much is involved in using the generic org parser (which one I am not sure) to hook into ediff??

Re: [O] Org, Diffs, and Version Control

2011-10-16 Thread Herbert Sitz
Eric Schulte 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

Re: [O] Org, Diffs, and Version Control

2011-10-16 Thread Eric Schulte
>> 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

Re: [O] Org, Diffs, and Version Control

2011-10-16 Thread Bernt Hansen
Dave Abrahams 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 like tags and p

[O] Org, Diffs, and Version Control

2011-10-16 Thread Dave Abrahams
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 hea