Skip to content

Commit 4603ce3

Browse files
committed
rn-136: Tiny fixes and rephrasings.
1 parent a859567 commit 4603ce3

1 file changed

Lines changed: 36 additions & 36 deletions

File tree

rev_news/drafts/edition-136.md

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This edition covers what happened during the months of May and June 2026.
3131
The work was spurred by a real-world report where `git cherry` jobs were each
3232
doing hundreds of single-blob fetches, at a cost of around 3 seconds
3333
each, so that batching those downloads should dramatically speed up
34-
such jobs. As Elijah put it, he "decided to fix up git grep
34+
such jobs. As Elijah put it, he "decided to fix up `git grep`
3535
similarly while at it". The series also corrected a small
3636
documentation typo he had noticed in `patch-ids.h` (a missing
3737
trailing parenthesis in a comment), as a preparatory fixup.
@@ -64,10 +64,10 @@ This edition covers what happened during the months of May and June 2026.
6464
`collect_diff_blob_oids()`, lists the blob OIDs touched by a
6565
commit's diff. It leaves out files that are explicitly marked as
6666
binary in the userdiff configuration, because for those files
67-
patch-ID just hashes the OID with `oid_to_hex()` instead of
68-
reading the blob, so there is no point downloading it.
67+
the `patch_id` just hashes the OID with `oid_to_hex()` instead of
68+
reading the blob, so there is no point downloading them.
6969

70-
While git cherry relies on hashmap comparisons, the `git grep` patch
70+
While `git cherry` relies on hashmap comparisons, the `git grep` patch
7171
takes an analogous but simpler approach: it adds a preliminary walk
7272
over the tree (similar to `grep_tree()`) that collects the blobs of
7373
interest and prefetches them in one go.
@@ -76,8 +76,8 @@ This edition covers what happened during the months of May and June 2026.
7676
spotted something that did not belong: the series added a 210-line
7777
`investigations/cherry-prefetch-design-spec.md` file to the
7878
project. He pointed out that, as a document describing how
79-
`git cherry` works, "it is vastly lacking", that much of its content
80-
is the sort of material that would normally go in a commit message,
79+
`git cherry` works, it was "vastly lacking", that much of its content
80+
was the sort of material that would normally go into a commit message,
8181
and that he was "not sure how others would benefit from being able
8282
to read it" once the series landed. Elijah's reply was short and to
8383
the point: "Ugh, no, sorry." That stray file had been committed by
@@ -240,7 +240,7 @@ This edition covers what happened during the months of May and June 2026.
240240
improved documentation. The thread also clarified the boundaries of
241241
partial-clone friendliness for cherry-pick detection, leaving the
242242
door open for sharing the new code with `git rebase` and
243-
`git log --cherry-pick` should someone wish to carry that work
243+
`git log --cherry-pick`, should someone wish to carry that work
244244
forward.
245245

246246
<!---
@@ -288,7 +288,7 @@ __Various__
288288
[II](https://replicated.wiki/blog/partII.html),
289289
[III](https://replicated.wiki/blog/partIII.html))
290290
and [Beagle: git, URIs and all the dirty words](https://replicated.wiki/blog/uris.html).<br>
291-
[Beagle SCM](https://replicated.wiki/) intends to be a git-compatible LLM-age source code management system.
291+
[Beagle SCM](https://replicated.wiki/) intends to be a Git-compatible LLM-age source code management system.
292292
+ [Software Is Made Between Commits](https://zed.dev/blog/introducing-deltadb)
293293
by Nathan Sobo on Zed editor blog,
294294
about [DeltaDB](https://zed.dev/deltadb), a version control system (in beta)
@@ -307,7 +307,7 @@ __Various__
307307
+ [How to make best use of git and GitHub for AI-assisted software development](https://blog.jonudell.net/2026/06/02/how-to-make-best-use-of-git-and-github-for-ai-assisted-software-development/)
308308
by Jon Udell on his blog,
309309
about [Bram](https://github.com/judell/bram) (Bram runs agents mindfully),
310-
a desktop app that helps you make best use of git and GitHub
310+
a desktop app that helps you make best use of Git and GitHub
311311
for AI-assisted software development.
312312

313313

@@ -326,7 +326,7 @@ __Light reading__
326326
[in-toto](https://in-toto.io/) - which protects the build pipeline; and
327327
[Sigstore](https://www.sigstore.dev/) - which allows to remove long-lived keys
328328
and for the developer to authenticate with <abbr title="OpenID Connect">OIDC</abbr>
329-
identity you already have, GitHub Actions or Google, etc.,
329+
identities you already have, like GitHub Actions, Google, etc.,
330330
where [Fulcio](https://github.com/sigstore/fulcio) issues
331331
a short-lived code-signing certificate bound to that OIDC identity valid for ten minutes,
332332
and the signature and cert go into [Sigstore Rekor](https://github.com/sigstore/rekor),
@@ -393,7 +393,7 @@ __Light reading__
393393
+ [Git merges can be better](https://brandondong.github.io/blog/git_merges_can_be_better/),
394394
on the trick one can use to ensure that the order of branches in the conflict
395395
is the same in the (tricked-out) merge as it is in rebase.
396-
Done with the help of a bash function.
396+
Done with the help of a Bash function.
397397
Written by Brandon Dong on their blog.
398398
+ [Git imerge (interactive merge)](https://wilsonmar.github.io/git-imerge/)
399399
by Wilson Mar on his blog (2017).
@@ -412,14 +412,14 @@ __Light reading__
412412
+ [Fixing Alembic's Multiple Heads Problem with Git](https://julien.danjou.info/blog/fixing-alembics-multiple-heads-problem-with-git/)
413413
by Julien Danjou on jd:/dev/blog, about the [alembic-git-revisions](https://github.com/mergifyio/alembic-git-revisions)
414414
tool for automatic [Alembic](https://alembic.sqlalchemy.org/)
415-
migration chaining based on git commit history.
415+
migration chaining based on Git commit history.
416416
+ [Alembic](https://alembic.sqlalchemy.org/) is a lightweight database migration tool
417417
for usage with the [SQLAlchemy](https://www.sqlalchemy.org/) Database Toolkit for Python.
418418
+ [Introducing django-linear-migrations](https://adamj.eu/tech/2020/12/10/introducing-django-linear-migrations/)
419419
by Adam Johnson on his blog (2020).
420420
+ [Goofy Program Files: git-slog](https://www.mcclimon.org/blog/goofy-program-files-git-slog/)
421421
by Michael McClimon on his blog (2023), about the Perl program he wrote
422-
to display oneline-like `git log` which include a single-character indicator
422+
to display oneline-like `git log` messages which include a single-character indicator
423423
to denote whether a commit has a 'Signed-off-by' trailer or not.
424424
+ [Git Submodules vs. Subtrees vs. Monorepos](https://slicker.me/git/submodules-vs-subtrees-vs-monorepos.html).
425425
+ [Costs exposed: Monorepo vs. multirepo](https://jmmv.dev/2023/08/costs-exposed-monorepo-multirepo.html)
@@ -434,31 +434,31 @@ __Light reading__
434434
+ [Marimo: A Modern Notebook for Reproducible Data Science](https://codecut.ai/marimo-a-modern-notebook-for-reproducible-data-science/)
435435
by Khuyen Tran on CodeCut\.AI blog.
436436
+ Alternatives include:
437-
[nbdev](https://nbdev.fast.ai/) tool that creates programming environment out of Jupyter notebooks
437+
[nbdev](https://nbdev.fast.ai/) - a tool that creates programming environment out of Jupyter notebooks
438438
(first mentioned in [Git Rev News Edition #69](https://git.github.io/rev_news/2020/11/27/edition-69/));
439-
[nbdime](http://nbdime.readthedocs.io/) tool for diffing Jupyter notebooks
439+
[nbdime](http://nbdime.readthedocs.io/) - a tool for diffing Jupyter notebooks
440440
(first mentioned in [Edition #37](https://git.github.io/rev_news/2018/03/21/edition-37/));
441-
[jupytext](https://github.com/mwouts/jupytext) tool for bidirectionally converting Jupyter notebooks
441+
[jupytext](https://github.com/mwouts/jupytext) - a tool for bidirectionally converting Jupyter notebooks
442442
to plain text files as either Markdown files or Python scripts
443443
(also mentioned in [Edition #69](https://git.github.io/rev_news/2020/11/27/edition-69/));
444444
[databooks](https://databooks.dev/) - a package and a CLI tool
445445
to ease the collaboration between data scientists using Jupyter notebooks,
446-
by reducing the number of git conflicts between different notebooks
447-
and resolution of git conflicts when encountered
446+
by reducing the number of Git conflicts between different notebooks
447+
and resolution of Git conflicts when encountered
448448
(first mentioned in [Git Rev News Edition #100](https://git.github.io/rev_news/2023/06/30/edition-100/)).
449449
+ See also [Git and Jupyter Notebooks: The Ultimate Guide](https://git.github.io/rev_news/2023/07/31/edition-101/) by ReviewNB,
450450
mentioned in [Git Rev News Edition #101](https://git.github.io/rev_news/2023/07/31/edition-101/).
451451
+ [The Hidden Git Stash Keys in Emacs VC Directory Mode](https://emacs.dyerdwelling.family/emacs/20260610061920-emacs--the-hidden-git-stash-keys-in-emacs-vc-directory-mode/)
452452
on Emacs Dwelling.
453453
+ [Using git-annex for Data Archiving](https://changelog.complete.org/archives/10516-using-git-annex-for-data-archiving)
454454
by John Goerzen on his blog - The ChangeLog (2023).
455-
+ [git-annex](https://git-annex.branchable.com/), which allows managing large files with git, without storing the file contents in git,
455+
+ [git-annex](https://git-annex.branchable.com/), which allows managing large files with Git, without storing the file contents in Git,
456456
was first mentioned in [Git Rev News Edition #3](https://git.github.io/rev_news/2015/05/13/edition-3/).
457457
+ [vcswatch and `git --filter`](https://www.df7cb.de/blog/2024/vcswatch-git-filter.html)
458458
by Christoph Berg on Myon's Blog (2024).
459459
+ [GitHub and the crime against software](https://eblog.fly.dev/githubbad.html):
460460
a software article by Efron Licht.
461-
+ [Evaluating new software forges (other than GitHub)](https://notgull.net/finding-a-forge/) by John Nunley on notgull (2023).
461+
+ [Evaluating new software forges (other than GitHub)](https://notgull.net/finding-a-forge/) by John Nunley on notgull (2023).
462462
+ [Communicating in Pull Requests](https://stolee.dev/2025/12/31/pr-communication)
463463
by Derric Stolee on Stolee's Dev Blog (2025).
464464

@@ -469,7 +469,7 @@ __Light reading__
469469
(and honest!) way to learn the most popular Git commands.
470470
Written by Bruno Brito on Git Tower blog.
471471
+ Compare [gitglossary(7)](https://git-scm.com/docs/gitglossary)
472-
from the git documentation.
472+
from the Git documentation.
473473

474474

475475
__Scientific papers__
@@ -503,12 +503,12 @@ __Easy watching__
503503

504504

505505
__Git tools and sites__
506-
+ [Worktrunk](https://worktrunk.dev/) is a CLI for git worktree management,
506+
+ [Worktrunk](https://worktrunk.dev/) is a CLI for Git worktree management,
507507
designed for running AI agents in parallel.
508508
[Written](https://github.com/max-sixty/worktrunk) in Rust,
509509
dual-licensed under MIT and Apache-2.0 license.
510510
+ [`nt`](https://github.com/allisonmahmood/NT) (short for **navigate tree**)
511-
is a tiny zsh command for hopping around worktrees:
511+
is a tiny `zsh` command for hopping around worktrees:
512512
it spins one up — or jumps to it if it already exists — `cd`s you in,
513513
and gets out of your way.
514514
Written as a Zsh script, under MIT license.
@@ -519,14 +519,14 @@ __Git tools and sites__
519519
or anything you want isolated per worktree.
520520
Written in Go, under MIT license.
521521
+ [rift](https://github.com/anomalyco/rift) is an _**experimental**_
522-
alternative to git worktrees using copy on write via reflinks or snapshots.
522+
alternative to Git worktrees using copy on write via reflinks or snapshots.
523523
Written in Rust, no license provided (yet).
524524
+ [gitprofile](https://github.com/meanii/gitprofile) is a tool to help
525-
manage multiple git identities — work, personal, open-source — so
525+
manage multiple Git identities — work, personal, open-source — so
526526
the right name, email, and SSH key are always used without thinking about it.
527-
It uses git's built-in [`includeIf` directive](https://git-scm.com/docs/git-config#_conditional_includes).
527+
It uses Git's built-in [`includeIf` directive](https://git-scm.com/docs/git-config#_conditional_includes).
528528
Written in Go, under MIT license.
529-
+ [hk](https://hk.jdx.dev/) is a git hook manager and project linting tool
529+
+ [hk](https://hk.jdx.dev/) is a Git hook manager and project linting tool
530530
with an emphasis on performance. Provides fast, powerful, and flexible hook management
531531
for modern development workflows.
532532
Written in Rust, under MIT license.
@@ -547,7 +547,7 @@ __Git tools and sites__
547547
Inspired by [DiffsHub](https://diffshub.com/),
548548
which was mentioned in [Git Rev News #135](https://git.github.io/rev_news/2026/05/31/edition-135/).
549549
+ [`git-pile`](https://github.com/keith/git-pile) is a set of scripts
550-
for using a [stacked-diff workflow](https://jg.gg/2018/09/29/stacked-diffs-versus-pull-requests) with git & GitHub.
550+
for using a [stacked-diff workflow](https://jg.gg/2018/09/29/stacked-diffs-versus-pull-requests) with Git & GitHub.
551551
There are a lot of different trade-offs for how this can work;
552552
`git-pile` chooses to be mostly not-magical at the cost of being best
553553
at handling multiple commits that don't conflict with each other
@@ -571,28 +571,28 @@ __Git tools and sites__
571571
[#135](https://git.github.io/rev_news/2026/05/31/edition-135/)
572572
(with links to many articles and tools).
573573
+ [sem](https://ataraxy-labs.github.io/sem/) (Semantic version control)
574-
is a command line tool that adds semantic understanding of git changes.
574+
is a command line tool that adds semantic understanding of Git changes.
575575
Instead of lines changed, sem tells you what entities changed:
576576
functions, methods, classes.
577-
Provides six subcommands: diff, blame, impact, log, entities, context.
577+
Provides six subcommands: diff, blame, impact, log, entities, and context.
578578
Also works outside Git for arbitrary file comparison.
579579
It parses code with tree-sitter. Helpful for working with AI agents.
580580
Written in Rust, under MIT and Apache 2.0 licenses.
581581
+ Part of the [Ataraxy Labs](https://ataraxy-labs.com/) stack — agent-native infrastructure
582582
for software development. See also:
583-
[weave](https://ataraxy-labs.com/weave) (entity-level git merge driver)
583+
[weave](https://ataraxy-labs.com/weave) (entity-level Git merge driver)
584584
· [inspect](https://github.com/Ataraxy-Labs/inspect) (semantic code review)
585585
· [opensessions](https://github.com/Ataraxy-Labs/inspect) (tmux sidebar for coding agents).
586586
+ [git-courer](https://github.com/blak0p/git-courer)
587587
is an [MCP](https://modelcontextprotocol.io/) (Model Context Protocol) server
588588
that gives AI agents a full, safe interface to Git — not just commits,
589-
but the whole surface: status, diff, branch, stash, history, sync.
589+
but the whole surface: status, diff, branch, stash, history, and sync.
590590
Includes 13 MCP tools, with structured JSON in, and structured JSON out.
591591
Every mutation backs itself up automatically.
592-
With local Ollama — zero tokens for git operations.
592+
With local Ollama — zero tokens for Git operations.
593593
Written in Go, under MIT license.
594594
+ [repo-slopscore](https://codeberg.org/polyphony/repo-slopscore)
595-
is a CLI + web app which gives a "slop score" for any public git repository
595+
is a CLI + web app which gives a "slop score" for any public Git repository
596596
resolvable via `https://`. It goes through the entire commit history of a repository
597597
(upper limit is 5000 commits currently) and detects visible signs of AI/LLM tool usage
598598
in the commit history and the source tree. Aggressive caching is used to ensure
@@ -606,12 +606,12 @@ __Git tools and sites__
606606
the `grit-git` binary crate is licensed under GPLv2 (like Git).
607607
+ [Flow Simulator](https://mainline.dev/flow-simulator) by Mainline is a web app
608608
where you can watch the simulation on how the code flows from idea to production
609-
under three branching strategies: GitHub flow, Git flow, trunk-based.
609+
under three branching strategies: GitHub flow, Git flow, and trunk-based.
610610
You can switch modes to compare.
611611
+ [Commit Crimes](https://commitcrimes.dev/) is a joke web app,
612612
where you can paste any GitHub handle; the app will then pull their permanent record,
613613
book the user for crimes against version control
614-
(e.g. uprotected pushes straight to 'main'), and hand down the sentence.
614+
(e.g. unprotected pushes straight to 'main'), and hand down the sentence.
615615

616616
+ [jj\_tui](https://tangled.org/elidowling.com/jj_tui) is a TUI for
617617
the [Jujutsu](https://jj-vcs.dev/) version control system,

0 commit comments

Comments
 (0)