Re: [OT] org and diff

2022-12-27 Thread Marcin Borkowski
On 2022-12-28, at 03:30, Samuel Wales wrote: > hi marcin, > > thanks for your blog post on my crash-proof editing idea. You're welcome! :-) In fact, it was an interesting exercise. > > more below > > On 12/17/22, Marcin Borkowski wrote: >> >> On 2022-12-17, at 03:06, Samuel Wales wrote:

Re: [OT] org and diff

2022-12-27 Thread Samuel Wales
well well. my habit of always hitting reply to all bit me. it was meant for the poster only, not for the list. apologies. it bites me once every 12 years or so. list members please disregard the message.

Re: [OT] org and diff

2022-12-27 Thread Samuel Wales
hi marcin, thanks for your blog post on my crash-proof editing idea. more below On 12/17/22, Marcin Borkowski wrote: > > On 2022-12-17, at 03:06, Samuel Wales wrote: > >> marcin> 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/

Re: [OT] org and diff

2022-12-17 Thread Ihor Radchenko
Marcin Borkowski writes: > Well, "months of changes" seems tough. I sometimes (rarely) have to > enter 2 days' worth of changes... It requires discipline, but > discipline pays off in /so many areas of life/... I have implemented several helpers that filter out uninteresting changes from

Re: [OT] org and diff

2022-12-17 Thread Marcin Borkowski
On 2022-12-17, at 03:06, Samuel Wales wrote: > marcin> 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

Re: [OT] org and diff

2022-12-16 Thread Samuel Wales
marcin> 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. for org, i mostly use git for reviewing

Re: [OT] org and diff

2022-11-21 Thread Samuel Wales
incidentally, if you want empty hunk headers, you can do this at least in my version of git: xfuncname = " " but idk why it works and i had had it commented out. On 11/21/22, Samuel Wales wrote: > p.s. hunk header munging does not unmingle [i.e. group changes by org > header in magit

Re: [OT] org and diff

2022-11-21 Thread Samuel Wales
p.s. hunk header munging does not unmingle [i.e. group changes by org header in magit status buffer diffs] :(. but it is true that what i want is some kind of preference given by magit to org entries as demarcated by org headings. idk if what i want is in principle possible or not in standard

Re: [OT] org and diff

2022-11-15 Thread Max Nikulin
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

Re: [OT] org and diff

2022-11-13 Thread Marcin Borkowski
On 2022-11-13, at 06:15, Samuel Wales 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

Re: [OT] org and diff

2022-11-12 Thread Samuel Wales
On 11/12/22, Ihor Radchenko wrote: > I have the following in my ~/.gitconfig: > > [diff "org"] > xfuncname = "^(\\*+ +.*)$" > > [core] > attributesfile = /home/yantar92/.gitattributes > > And ~/.gitattributes: > > *.org diff=org this looks interesting. i thought this stuff was just

Re: [OT] org and diff

2022-11-12 Thread Samuel Wales
ugh. i left out a probably significant fact that means i'd have to rework the whole post which i can't do atm. in /this particular example/ the file will actually still be there after staging. i forgot there are other changes in this concrete example. i am trying to clean up a set of magit

Re: [OT] org and diff

2022-11-12 Thread Ihor Radchenko
Samuel Wales writes: > someplace in it, is an entry with a 234-item plain list. if i try to > move this entry, and make no other changes, diff goes insane. if i > try to refile this entry to a different org file, diff similarly goes > insane, with the - part. only that change. > > ok, what

[OT] org and diff

2022-11-12 Thread Samuel Wales
i have a very old version of Magit, for reasons I won't get into. Fancier diff settings might be differnet or not available. But something drives me crazy. Probably not too Org-related, but it might be. I just want to know why, is all. I have a 24k line org file, and it's not that complex wrt