Re: [O] git and orgmode: teaching git a bit of orgmode syntax

Karl Voit writes: > Unfortunately, git does not handle diffs in a meaningful way. For > example, when there are sub-hierarchies added or removed, it ends up > with many diff-lines like the following: > > -* NEXT test with DAVdroid > +* Lesestoff [1/26]

Re: [O] git and orgmode: teaching git a bit of orgmode syntax

Hello, Nick Dokos writes: [...] > Thanks. It is quite likely that I misremembered: I found some things on Worg > about an org-aware merge tool for git: > > http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/proposal.html >

Re: [O] git and orgmode: teaching git a bit of orgmode syntax

Michael Welle writes: > Hello, > > Nick Dokos writes: > [...] >> [fn:1] I'd search, but Gmane still seems non-compos-mentis and >>searching in the archives is just awful (or my fu is too >>weak). Anybody know what is happening with Gmane?

Re: [O] git and orgmode: teaching git a bit of orgmode syntax

Karl Voit writes: > -* NEXT test with DAVdroid > +* Lesestoff [1/26]:2read: > :PROPERTIES: > -:CREATED: [2016-05-08 Sun 12:51] > +:CREATED: [2012-04-17 Tue 10:39] > +:ARCHIVE: %s_archive::* Lesestoff > +:CATEGORY: reading >

Re: [O] git and orgmode: teaching git a bit of orgmode syntax

Hello, Nick Dokos writes: [...] > [fn:1] I'd search, but Gmane still seems non-compos-mentis and >searching in the archives is just awful (or my fu is too >weak). Anybody know what is happening with Gmane? How do you >search the list nowadays? I have a

Re: [O] git and orgmode: teaching git a bit of orgmode syntax

Karl Voit writes: > Hi! > > I am using gitwatch[1] to auto-commit any changes to my org-mode > files in a git repository. > > Unfortunately, git does not handle diffs in a meaningful way. For > example, when there are sub-hierarchies added or removed, it ends up > with many

[O] git and orgmode: teaching git a bit of orgmode syntax

Hi! I am using gitwatch[1] to auto-commit any changes to my org-mode files in a git repository. Unfortunately, git does not handle diffs in a meaningful way. For example, when there are sub-hierarchies added or removed, it ends up with many diff-lines like the following: -* NEXT test with