From: Brett Viren <bv@bnl.gov>
To: Karl Voit <devnull@Karl-Voit.at>
Cc: Karl Voit <news1142@Karl-Voit.at>, emacs-orgmode@gnu.org
Subject: Re: git and orgmode: teaching git a bit of orgmode syntax
Date: Tue, 24 Jan 2017 11:02:38 -0500 [thread overview]
Message-ID: <ir4tw8oo38h.fsf@lycastus.phy.bnl.gov> (raw)
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")
[-- Attachment #1: Type: text/plain, Size: 703 bytes --]
Karl Voit <devnull@Karl-Voit.at> 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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 800 bytes --]
next prev parent reply other threads:[~2017-01-24 16:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-24 15:17 git and orgmode: teaching git a bit of orgmode syntax Karl Voit
2017-01-24 15:34 ` Nick Dokos
2017-01-24 16:10 ` Michael Welle
2017-01-24 17:59 ` Nick Dokos
2017-01-24 18:30 ` Michael Welle
2017-01-24 16:02 ` Brett Viren [this message]
2017-01-24 22:16 ` Stig Brautaset
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ir4tw8oo38h.fsf@lycastus.phy.bnl.gov \
--to=bv@bnl.gov \
--cc=devnull@Karl-Voit.at \
--cc=emacs-orgmode@gnu.org \
--cc=news1142@Karl-Voit.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).