From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brett Viren Subject: Re: git and orgmode: teaching git a bit of orgmode syntax Date: Tue, 24 Jan 2017 11:02:38 -0500 Message-ID: References: <2017-01-24T16-07-08@devnull.Karl-Voit.at> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW40n-0006Mb-Eq for emacs-orgmode@gnu.org; Tue, 24 Jan 2017 11:32:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cW40j-0005LM-Hi for emacs-orgmode@gnu.org; Tue, 24 Jan 2017 11:32:01 -0500 Received: from smtpgw.bnl.gov ([2620:10a:0:3::30]:54396 helo=iron4.sec.bnl.local) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1cW40j-0005L2-BE for emacs-orgmode@gnu.org; Tue, 24 Jan 2017 11:31:57 -0500 In-Reply-To: <2017-01-24T16-07-08@devnull.Karl-Voit.at> (Karl Voit's message of "Tue, 24 Jan 2017 16:17:55 +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: Karl Voit Cc: Karl Voit , emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain 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 > :END: Without seeing before/after versions it's not clear that this diff is somehow wrong. Depending on the editing one does to a given file, a diff may seem "non local" with some chunks appearing to undo something and others redoing it. This happens when parts of the file get rearranged. For example, do either of your headlines appear elsewhere in your diff with their "+/-" signs reversed? -Brett. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJYh3qfAAoJEFsAceCXpRtHokcP/2HT3EcdM+CqYIwx5q78wfUq EjJN0sFCIOJ8rCIKrF3AtqsshLDu9B8X0WVvKxPyUCHCJJJWYqTcgXWLL/zU1oSb ZXwZhTQ4vqrrNyHvm5sfzXcZrHyPHZpySyTGCO6ZSPk1BsdAjfSF6DD/neoJA1zG k8bMULy02XthAEND0lEeM5tIZlu8+rOzzPWaM7+EP8alyfkuw+uTARLlwceSa1HJ stjQ2cOkIjMK4OMK1Y4alh8qvG6T44zXlXV5+G7KX45V0iPx/qQ18MC4/8Qwm9uW xDoM7rBg71k/PiV5ZCrkntAnrRkWQIct39GlUxcNC31sY44YTYp+cKUqPWdmjulF 0Qba7rvyX6JA1xeoEmARbtIW0kIcazKQ+6QF91kB7EzN+HVlFESM6b3NvqXQV5uD oVVJ5gUsF5pMeJn7w86ReIZOn3mwToHjPCgbuFZpeKSwQJD+7rX3cFOhnGTwEU8I 8w08g/RqsKP/5LCgbNdKJf/sNnexRwP+EbHj9/I1cU0n/Lqe0t70Wx8tibfkBD1x FpNnDv0J8BOW2WKa/l1l7oN5yFZ6G9nRzKiaSVB7dvxusKeaa4oCRUkrCSdVDqsu Ffp6pwdagMyuxWAPtavHRBjhvnLU0zTB42NkGtbwy1uLkwTinjCkCP69lIfJATvu C0n5saBcJ4395NjGFE3b =OMKQ -----END PGP SIGNATURE----- --=-=-=--