Re: [O] advice needed: how do you guys sync org files between devices?

[Suvayu Ali]

On Tue, Jul 02, 2013 at 06:11:14PM +0200, David Engster wrote:
> Suvayu Ali writes:
> > That said, I think you might be right.  Possibly it could be resolved by
> > just changing the algorithm, I don't know why I never tried that though.
> 
> You might want to try setting diff.algorithm to 'patience' and maybe
> also raise diff.context to something like 6 or so if that doesn't solve
> your problem. It very much depends on how your Org files look.

Is diff.algorithm new?  I could not find it in the manpage on my laptop
(git version 1.8.1.4).  However I do see it on the online docs[1].  In
any case, I have set the variables.  Next time I merge Org files, I get
to test it!

Thanks a lot David,


Footnotes:

[1] <http://git-scm.com/docs/git-diff>

-- 
Suvayu

Open source is the future. It sets us free.