Skip to content

Commit 0897ab1

Browse files
committed
rn-133: minor copy edit
1 parent c7b5565 commit 0897ab1

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

rev_news/drafts/edition-133.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ __Various__
494494
code collaboration stack built on Git.
495495
It was first mentioned in [Git Rev News Edition #49](https://git.github.io/rev_news/2019/03/20/edition-49/)
496496
and most recently in [edition #131](https://git.github.io/rev_news/2026/01/31/edition-131/).<br>
497-
Compare [Tangled](https://tangled.org/) (built on top of AT Protocol),
497+
Compare with [Tangled](https://tangled.org/) (built on top of AT Protocol),
498498
[Grasp](https://ngit.dev/grasp/) and [`git str`](https://github.com/fiatjaf/gitstr) (built on top of Nostr), and
499499
[`git-ssb`](https://scuttlebot.io/apis/community/git-ssb.html) (built on top of Secure-ScuttleButt (SSB); though SSB ecosystem contracted, with latest news from 2024).
500500
+ [b4's Review TUI With AI Integration Nearing Pre-Alpha Release](https://www.phoronix.com/news/b4-review-nears-pre-alpha)
@@ -526,7 +526,7 @@ __Light reading__
526526
the problem of flaky, non-deterministic tests.
527527
+ [Git Tricks with Tri and Difft](https://nabeelvalley.co.za/blog/2026/26-03/tri-x-git-tricks/)
528528
by Nabeel Valley on their blog.
529-
+ [Tri](https://github.com/sftsrv/tri) is TUI interactive directory tree browser,
529+
+ [Tri](https://github.com/sftsrv/tri) is a TUI interactive directory tree browser,
530530
and [difft, or Difftastic](https://difftastic.wilfred.me.uk/introduction.html)
531531
is a structural diff tool that understands syntax.
532532
Difftastic was first mentioned in [Git Rev News Edition #86](https://git.github.io/rev_news/2022/04/30/edition-86/),
@@ -552,10 +552,10 @@ __Light reading__
552552
as buildings, grouped together in districts corresponding to top-level packages
553553
(squarified treemap), with footprint corresponding to size in lines of code,
554554
height corresponding to complexity, and color corresponding to "health".
555-
Follows from [Legibility: A Scaling Bottleneck of the Agentic Era](https://verial.xyz/essays/legibility) essay.
555+
Follows from the [Legibility: A Scaling Bottleneck of the Agentic Era](https://verial.xyz/essays/legibility) essay.
556556
+ [“Use git worktrees,” they said. “It’ll be fun!” they said.](https://daveschumaker.net/use-git-worktrees-they-said-itll-be-fun-they-said/)
557557
by Dave Schumaker on his blog.
558-
This posts describes problem with often used solutions like
558+
This post describes a problem with often used solutions like
559559
symlinked `node_modules` or `.venv` directories, Yarn’s hardlinks-global mode,
560560
APFS Copy-on-Write (`cp -c`) - which is also supported by other filesystems.
561561
Proposes keeping a fixed pool of 6 worktree slots, and recycling them as needed.
@@ -602,14 +602,14 @@ __Light reading__
602602
+ [Git: ignoring temporary changes](https://blog.narf.ssji.net/2026/03/18/git-ignoring-temporary-changes/)
603603
by Olivier Mehani on Narf blog.
604604
He proposes using `git update-index --assume-unchanged <PATH>`, which is not safe;
605-
a safer solition is to use `--skip-worktree` instead (won't lose changes, may prevent safe operation).
605+
a safer solution is to use `--skip-worktree` instead (won't lose changes, may prevent safe operation).
606606
+ Compare [Use skip-worktree to ignore modified files](https://www.brandonpugh.com/til/git/skip-worktree-ignore-modified-files/)
607607
by Brandon Pugh, mentioned in [Git Rev News Edition #129](https://git.github.io/rev_news/2025/11/30/edition-129/).
608608
+ [SQLite on Git, Prologue: Why do we need random access in git](https://blog.lysk.tech/sqlite-on-git-prologue/) and
609609
[SQLite on Git, Part I: The .git folder - Falling down the Rabbithole](https://blog.lysk.tech/sqlite-on-git-part-1)
610-
are first two parts of upcoming series of blogposts, where the author shares a research
610+
are the first two parts of an upcoming series of blogposts, where the author shares research
611611
enabling one to have a version controlled filesystem
612-
that allows to run versioned SQLite database on top of Git's internal storage.
612+
that allows running a versioned SQLite database on top of Git's internal storage.
613613
Written by Martin R. Lysk on his blog.
614614
+ Contrast [Git in Postgres](https://nesbitt.io/2026/02/26/git-in-postgres.html)
615615
by Andrew Nesbitt mentioned in [Git Rev News Edition #132](https://git.github.io/rev_news/2026/02/28/edition-132/).
@@ -635,8 +635,8 @@ __Light reading__
635635
+ [Magit and Majutsu: discoverable version-control](https://lwn.net/Articles/1060024/)
636636
by Daroc Alden on LWN\.net.
637637
+ [Majutsu](https://github.com/0WD0/majutsu) provides a [Magit](https://magit.vc/)-style
638-
interface for [Jujutsu (`jj`)](https://www.jj-vcs.dev/) in GNU Emacs,
639-
was first mentioned in [Git Rev News Edition #132](https://git.github.io/rev_news/2026/02/28/edition-132/).
638+
interface for [Jujutsu (`jj`)](https://www.jj-vcs.dev/) in GNU Emacs.
639+
First mentioned in [Git Rev News Edition #132](https://git.github.io/rev_news/2026/02/28/edition-132/).
640640
+ [Editing changes in patch format with Jujutsu VCS](https://www.knifepoint.net/~kat/kb-jj-patchedit.html)
641641
by Katalin Rebhan (@dblsaiko) on her blog.
642642
+ [Manyana: A Coherent Vision for the Future of Version Control](https://bramcohen.com/p/manyana)
@@ -645,14 +645,14 @@ __Light reading__
645645
about his approach of using CRDTs (Conflict-free Replicated Data Types) for version control.<br>
646646
The ideas behind [Manyana](https://github.com/bramcohen/manyana),
647647
with a prototype written in Python, looks a bit similar to [Codeville](https://web.archive.org/web/20070202014158/http://codeville.org/),
648-
distributed version control system created around 2005 by Ross and Bram Cohen,
649-
with unique merging algorithm, no longer existing.
648+
a distributed version control system created around 2005 by Ross and Bram Cohen,
649+
with a unique merging algorithm, no longer existing.
650650
+ [Development tools: Sashiko, b4 review, and API specification](https://lwn.net/Articles/1063303/)
651651
by Jonathan Corbet on LWN\.net ([free link](https://lwn.net/SubscriberLink/1063303/c076cd05ab3bef54/)).
652652
+ Konstantin Ryabitsev's [b4 tool](https://b4.docs.kernel.org/en/latest/)
653653
was first mentioned in [Git Rev News Edition #61](https://git.github.io/rev_news/2020/03/25/edition-61/),
654654
and most recently in [Edition #127](https://git.github.io/rev_news/2025/09/30/edition-127/).
655-
It is also listed on [Hacking Git](https://git.github.io/Hacking-Git/) page.
655+
It is also listed on the [Hacking Git](https://git.github.io/Hacking-Git/) page.
656656
+ [Mercurial at Google: Also known as Fig](https://mercurial.paris/download/Mercurial%20at%20Google.pdf),
657657
slides by Martin von Zweigbergk, presented at 2023-04-06.
658658

@@ -676,15 +676,15 @@ __Scientific papers__
676676
[git-hires-merge](https://github.com/paulaltin/git-hires-merge),
677677
[IntelliMerge](https://github.com/Symbolk/IntelliMerge) (Java only),
678678
[Spork](https://github.com/ASSERT-KTH/spork) (Java only),
679-
and their [Plume-lib merging](https://github.com/plume-lib/merging).
679+
and their own [Plume-lib merging](https://github.com/plume-lib/merging).
680680
+ They considered, but did not evaluate
681681
[JDime](https://github.com/se-sic/jdime) (Java only) because of its limitations;
682682
and AutoMerge (also known as AutoMerge-PTM), DeepMerge, MergeBERT -
683683
because those tools are not publicly available.
684-
They could not evaluate tools that base on GUI interaction,
684+
They could not evaluate tools based on GUI interaction,
685685
like [RefMerge](https://github.com/ualberta-smr/RefMerge) (IntelliJ IDEA plugin)
686686
or [FSTMerge](http://www.fosd.de/SSMerge/) (part of FeatureHouse, depends on KDiff3).
687-
+ [Mergiraf](https://mergiraf.org/) did not exists at the time this paper was written.
687+
+ [Mergiraf](https://mergiraf.org/) did not exist at the time this paper was written.
688688
Mergiraf was mentioned in [Git Rev News Edition #117](https://git.github.io/rev_news/2024/11/30/edition-117/),
689689
[#119](https://git.github.io/rev_news/2025/01/31/edition-119/) (in passing),
690690
and [#129](https://git.github.io/rev_news/2025/11/30/edition-129/).
@@ -697,7 +697,7 @@ __Scientific papers__
697697
preprint on [arXiv:2507.19687](https://arxiv.org/abs/2507.19687) (25 July 2025).
698698
It compares four structured merge tools:
699699
two Java specific tools, JDime and Spork, and their generic counterparts,
700-
respectively Mergiraf and their LastMerge tool (currently not available).
700+
Mergiraf and their own LastMerge tool (currently not available), respectively.
701701
+ They also mention [s3m](https://github.com/guilhermejccavalcanti/s3m)
702702
([Semistructured 3-Way Merge](https://pauloborba.cin.ufpe.br/project/s3m/)) for Java.
703703
+ Qingyu Zhang, Junzhe Li, Jiayi Lin, Jie Ding, Lanteng Lin, and Chenxiong Qian:
@@ -755,8 +755,8 @@ __Git tools and sites__
755755
(which uses built-in [subtree](https://git-scm.com/docs/git-merge#Documentation/git-merge.txt-subtreepath) merge strategy),
756756
[`git stree`](https://github.com/deliciousinsights/git-stree),
757757
and [`git subrepo`](https://github.com/ingydotnet/git-subrepo).
758-
+ [GitBucket](https://gitbucket.github.io/) is Open Source Git platform on JVM
759-
(software forge), with easy installation, high extensibility & GitHub API compatibility.
758+
+ [GitBucket](https://gitbucket.github.io/) is an Open Source Git platform on JVM
759+
(a software forge), with easy installation, high extensibility & GitHub API compatibility.
760760
Written in Scala, under Apache License Version 2.0.
761761
+ [CodebaseHQ](https://www.codebasehq.com/) by Krystal is a software forge that
762762
offers Git, Mercurial and Subversion hosting, with project management tools.
@@ -771,7 +771,7 @@ __Git tools and sites__
771771
extracting architecture, patterns, and institutional knowledge,
772772
to give your AI assistant the context it needs - deep understanding
773773
of your code, files, and architectural decisions.
774-
Integrates via [MCP}(https://spec.modelcontextprotocol.io/) (Model Context Protocol).
774+
Integrates via [MCP](https://spec.modelcontextprotocol.io/) (Model Context Protocol).
775775
Written in Python, under MIT license.
776776
+ [Sashiko](https://sashiko.dev/) is an agentic Linux kernel code review system,
777777
using LLM (Large Language Model). It monitors public mailing lists

0 commit comments

Comments
 (0)