From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nick Dokos Subject: Re: git and orgmode: teaching git a bit of orgmode syntax Date: Tue, 24 Jan 2017 12:59:35 -0500 Message-ID: <87inp47308.fsf@gmail.com> References: <2017-01-24T16-07-08@devnull.Karl-Voit.at> <87mveg79qm.fsf@gmail.com> <87tw8ol9q1.fsf@luisa.c0t0d0s0.de> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW5O7-0003ue-BP for emacs-orgmode@gnu.org; Tue, 24 Jan 2017 13:00:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cW5O2-0007Iq-GL for emacs-orgmode@gnu.org; Tue, 24 Jan 2017 13:00:11 -0500 Received: from [195.159.176.226] (port=57203 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cW5O2-0007IA-BI for emacs-orgmode@gnu.org; Tue, 24 Jan 2017 13:00:06 -0500 Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1cW5Nk-0005jY-P0 for emacs-orgmode@gnu.org; Tue, 24 Jan 2017 18:59:48 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: emacs-orgmode@gnu.org 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? How do you >> search the list nowadays? > I have a mail folder with about 60k mails. The oldest seem to be 10 > years old. I doubt that it is complete, but who knows. What should I > look for? I searched the subjects for gsoc|summer of code and found one > from 2013, IIRC. But that doesn't lead to anything. Searching for > difference in the subject wasn't fruitful either. > 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 http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/ but not for a diff tool. And I'm not sure it ever saw the light of day. -- Nick