From: Marcin Borkowski <mbork@mbork.pl>
To: Samuel Wales <samologist@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [OT] org and diff
Date: Sun, 13 Nov 2022 10:32:29 +0100 [thread overview]
Message-ID: <87r0y7ci9o.fsf@mbork.pl> (raw)
In-Reply-To: <CAJcAo8vJ8DXDgJzr15ESXQ3s0ifZja3vJ7wTFDu9x-TguWOiMg@mail.gmail.com>
On 2022-11-13, at 06:15, Samuel Wales <samologist@gmail.com> wrote:
> But something drives me crazy. Probably not too Org-related, but it
> might be. I just want to know why, is all.
> [...] diff goes insane.
I think this is a known problem with diff, which is inherently
line-based and knows nothing about actual syntax of the underlying
language.
FWIW, if things like this happen to me (and they do happen a lot,
especially when I'm doing code review), I abandon diff and use
difftastic (https://difftastic.wilfred.me.uk/) instead.
Surprisingly, difftastic seems not to support Org syntax.
One question I'd ask is: how important a legible diff is to you? I keep
my Org files in Git, too, but if /I/ know what was changed, I just don't
care about diff going nuts and I treat it as (more or less) Git's
internal implementation detail.
Just my 2cents (not too helpful, I'm afraid...)
--
Marcin Borkowski
http://mbork.pl
next prev parent reply other threads:[~2022-11-13 9:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-13 5:15 [OT] org and diff Samuel Wales
2022-11-13 5:32 ` Ihor Radchenko
2022-11-13 6:06 ` Samuel Wales
2022-11-15 16:58 ` Max Nikulin
2022-11-13 5:38 ` Samuel Wales
2022-11-13 9:32 ` Marcin Borkowski [this message]
2022-11-22 3:06 ` Samuel Wales
2022-11-22 3:17 ` Samuel Wales
2022-12-17 2:06 ` Samuel Wales
2022-12-17 8:36 ` Marcin Borkowski
2022-12-17 8:41 ` Ihor Radchenko
2022-12-28 2:30 ` Samuel Wales
2022-12-28 2:32 ` Samuel Wales
2022-12-28 6:35 ` Marcin Borkowski
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=87r0y7ci9o.fsf@mbork.pl \
--to=mbork@mbork.pl \
--cc=emacs-orgmode@gnu.org \
--cc=samologist@gmail.com \
/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).