From: Max Nikulin <manikulin@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: [OT] org and diff
Date: Tue, 15 Nov 2022 23:58:44 +0700 [thread overview]
Message-ID: <tl0gg5$fvm$1@ciao.gmane.io> (raw)
In-Reply-To: <CAJcAo8vmX9ph0=djYMDdf=hQV_qjuHBO=wMwOKr8b9Z8OoUVYw@mail.gmail.com>
On 13/11/2022 13:06, Samuel Wales wrote:
> On 11/12/22, Ihor Radchenko wrote:
>> I have the following in my ~/.gitconfig:
>>
>> [diff "org"]
>> xfuncname = "^(\\*+ +.*)$"
Thank you for sharing this. I was sure it should be possible, but I was
not motivated enough to configure hunk headers for elisp and org. It
seems even a shorter regexp works well
xfuncname = "^\\*+ .*"
>> [core]
>> attributesfile = /home/yantar92/.gitattributes
Git may find ~/.config/git/attributes without explicit configuration
> this looks interesting. i thought this stuff was just for configuring
> the helper text on the hunk headers that tell you what function the
> hunk is in, kind of thing.
I am unsure that it affects diff as well. Once I have experienced noisy
diff on attempt to refile a subtree. Finally I did it by moving headings
by small portions. It allowed to confirm changes during each steps.
>> Source: https://protesilaos.com/codelog/2021-01-26-git-diff-hunk-elisp-org/
>
> idk why but this page is blank for me. then if i try to disable
> noscript restrictions, noscript says "This is a privileged page, whose
> permissions cannot be configured".
Perhaps you were unlucky to fetch the page during server maintenance.
Firefox-106 renders the page with active NoScript.
The approach is documented in the "Defining a custom hunk-header"
section of gitattributes(5).
The value of the page is that it has a recipe for elisp (indented
`cl-defstruct' is not handled though).
next prev parent reply other threads:[~2022-11-15 16:59 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 [this message]
2022-11-13 5:38 ` Samuel Wales
2022-11-13 9:32 ` Marcin Borkowski
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='tl0gg5$fvm$1@ciao.gmane.io' \
--to=manikulin@gmail.com \
--cc=emacs-orgmode@gnu.org \
/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).