From mboxrd@z Thu Jan  1 00:00:00 1970
From: Suvayu Ali <fatkasuvayu+linux@gmail.com>
Subject: Re: advice needed: how do you guys sync org files between devices?
Date: Tue, 2 Jul 2013 18:51:52 +0200
Message-ID: <20130702165152.GI26752@kuru.dyndns-at-home.com>
References: <CAOQHXPrecrtEQM4j5SNXrRCHe7dKhLsc6W0PmsRUwPmOaD7GPw@mail.gmail.com>
	<CAF6Daj+c=a8E2xjk73i=mYMxMiomkFWaPNMWCi3cmAXHOmj5bg@mail.gmail.com>
	<CAJMNdQ+K=HEfj0L7H2kOYD00Q8X=2w9mMMK_51Tti-0+MMWAvQ@mail.gmail.com>
	<20130702101723.GA26752@kuru.dyndns-at-home.com>
	<87y59p3qc7.fsf@engster.org>
	<20130702160853.GG26752@kuru.dyndns-at-home.com>
	<87txkd3pst.fsf@engster.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54757)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <fatkasuvayu+linux@gmail.com>) id 1Uu3o7-0004zu-NC
	for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 12:52:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <fatkasuvayu+linux@gmail.com>) id 1Uu3o5-0005Yn-NQ
	for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 12:51:59 -0400
Received: from mail-ee0-x22b.google.com ([2a00:1450:4013:c00::22b]:65215)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <fatkasuvayu+linux@gmail.com>) id 1Uu3o5-0005Xy-H7
	for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 12:51:57 -0400
Received: by mail-ee0-f43.google.com with SMTP id l10so2881835eei.30
	for <emacs-orgmode@gnu.org>; Tue, 02 Jul 2013 09:51:56 -0700 (PDT)
Received: from kuru.dyndns-at-home.com
	([2001:610:120:3001:f2de:f1ff:fe37:c76c])
	by mx.google.com with ESMTPSA id m1sm37800014eex.17.2013.07.02.09.51.54
	for <emacs-orgmode@gnu.org>
	(version=TLSv1.2 cipher=RC4-SHA bits=128/128);
	Tue, 02 Jul 2013 09:51:55 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <87txkd3pst.fsf@engster.org>
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: emacs-orgmode@gnu.org

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.