Skip to content

Commit 77b8259

Browse files
authored
Merge pull request git#725 from stepnem/rn114copyedit
rn-114: minor copy edit
2 parents 3685987 + 27bd884 commit 77b8259

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

rev_news/drafts/edition-114.md

+19-20
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Welcome to the 114th edition of [Git Rev News](https://git.github.io/rev_news/re
1313
a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to
1414
subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io).
1515

16-
This edition covers what happened during the months of July 2024 and August 2024.
16+
This edition covers what happened during the months of July and August 2024.
1717

1818
## Discussions
1919

@@ -50,7 +50,7 @@ This edition covers what happened during the months of July 2024 and August 2024
5050
feedback goes a long way towards encouraging contributors to
5151
participate more actively in the Git community."
5252

53-
Eric Sunshine then replied to Junio pointing a minor typo in his
53+
Eric Sunshine then replied to Junio pointing out a minor typo in his
5454
patch. Patrick Steinhardt replied to Junio too. He said that he had
5555
already guided some of his GitLab colleagues who review patches
5656
and suggested them to do what Junio describes.
@@ -88,10 +88,10 @@ __Various__
8888
+ [Forgejo](https://forgejo.org/) is a self-hosted lightweight software forge,
8989
written in Go; nowadays a hard fork of Gitea (which in turn was based on Gogs).
9090
It was mentioned in passing in [Git Rev News Edition #103](https://git.github.io/rev_news/2023/09/30/edition-103/),
91-
as one of forges working on implementing [ForgeFed](https://forgefed.org/)
91+
as one of the forges working on implementing the [ForgeFed](https://forgefed.org/)
9292
federation protocol for forge services.
9393
+ Packt recently published the second edition of the “Mastering Git” book
94-
by Jakub Narębski, one of editors of the Git Rev News.
94+
by Jakub Narębski, one of the Git Rev News editors.
9595
The book is available [on PacktPub](https://www.packtpub.com/en-us/product/mastering-git-9781835086070)
9696
and [on Amazon](https://www.amazon.com/Mastering-Git-expert-level-proficiency-distributed-ebook/dp/B0D98BR1T7).
9797
The first edition of the book was mentioned in [Git Rev News Edition #16](https://git.github.io/rev_news/2016/06/15/edition-16/);
@@ -105,7 +105,7 @@ __Light reading__
105105
"[interactively stage changes with --patch](https://tekin.co.uk/2017/03/git-tips-you-possibly-did-not-know-you-needed#3-interactively-stage-changes-with---patch)" advice
106106
in [Git Tips you (Possibly) Didn't Know You Needed](https://tekin.co.uk/2017/03/git-tips-you-possibly-did-not-know-you-needed).
107107
+ [Tracing the evolution of a Python function with git log](https://nerderati.com/tracing-the-evolution-of-a-python-function-with-git-log/)
108-
by Joël Perras on his Nerderati blog. It shows detailed example on using `git log -L`
108+
by Joël Perras on his Nerderati blog. It shows a detailed example on using `git log -L`
109109
(and `diff=python` gitattribute) to diagnose a real-life bug that was ostensibly
110110
caused by an upgrade to Authlib.
111111
+ This technique is also described in the
@@ -124,24 +124,23 @@ __Light reading__
124124
+ It was used by the author to create [1991-WWW-NeXT-Implementation](https://github.com/simonw/1991-WWW-NeXT-Implementation)
125125
repository out of [the archive](https://www.w3.org/History/1991-WWW-NeXT/Implementation/)
126126
of Tim Berner-Lee's original code for the WorldWideWeb application for NeXT.
127-
This endeavor was described in [1991-WWW-NeXT-Implementation on GitHub](https://simonwillison.net/2024/Aug/1/www-next-implementation-on-github/)
128-
short blog post.
127+
This endeavor was described in a short blog post, [1991-WWW-NeXT-Implementation on GitHub](https://simonwillison.net/2024/Aug/1/www-next-implementation-on-github/).
129128
+ [Store Code Discussions in Git using Git Notes](https://wouterj.nl/2024/08/git-notes)
130129
by Wouter de Jong on his blog. The article includes some code (in PHP)
131130
that uses the GitHub API to fetch the pull request comments and store them
132131
in notes (under `github-comments` notes reference).
133132
+ [Attaching notes to git branches](https://dev.to/pinotattari/attaching-notes-to-git-branches-503k)
134133
by Riccardo Bernardini on DEV\.to. The article describes why this feature is useful,
135134
and how `git branch --edit-description` and `git notes` fall short; which led to
136-
creation of [git-branchnotes](https://gitlab.com/mockturtle/git-branchnotes) tool.
135+
the creation of the [git-branchnotes](https://gitlab.com/mockturtle/git-branchnotes) tool.
137136
+ [This developer tool is 40 years old: can it be improved?](https://stackoverflow.blog/2024/08/05/this-developer-tool-is-40-years-old-can-it-be-improved)
138137
by Bill Harding (CEO at GitClear) on StackOverflow Blog.
139138
The article describes how GitClear's "Commit Cruncher" diff algorithm works,
140139
which was created with the goal of making code reviews easier.
141-
Note that Myers diff algorithm (created by Eugene Myers in his
140+
Note that the Myers diff algorithm (created by Eugene Myers in his
142141
[seminal work](http://www.xmailserver.org/diff2.pdf) in 1986)
143142
is not the only one available in [`git diff`](https://git-scm.com/docs/git-diff):
144-
there are also `minimal`, `patience` and `histogram` diff algoritms available
143+
there are also `minimal`, `patience` and `histogram` diff algorithms available
145144
(via the `--diff-algorithm` option);
146145
this was not stated in the article.
147146
+ [How Different Are Different diff Algorithms in Git?](https://cs.paperswithcode.com/paper/how-different-are-different-diff-algorithms):
@@ -159,8 +158,8 @@ __Light reading__
159158
<!-- -->
160159

161160
+ [Code review antipatterns](https://www.chiark.greenend.org.uk/~sgtatham/quasiblog/code-review-antipatterns/)
162-
for dark side developers, a joke article by Simon Tatham
163-
(don’t do things described in this article).
161+
for the dark side developers, a joke article by Simon Tatham
162+
(don’t do the things described in this article).
164163

165164
<!---
166165
__Easy watching__
@@ -171,17 +170,17 @@ __Git tools and sites__
171170
note that some articles are paid members only. Powered by Ghost.
172171
+ [Carapace-bin](https://github.com/carapace-sh/carapace-bin) provides argument completion
173172
for multiple CLI commands ([full list](https://carapace-sh.github.io/carapace-bin/completers.html)
174-
includes Git, [git-extras](https://github.com/tj/git-extras), `gh` GitHub CLI, `glab` GitLab CLI,
173+
including Git, [git-extras](https://github.com/tj/git-extras), `gh` GitHub CLI, `glab` GitLab CLI,
175174
`tea` Gitea CLI, etc.), and works across multiple POSIX and non-POSIX shells.
176-
Details about complete support for Git can be found in issue [#99](https://github.com/carapace-sh/carapace-bin/issues/99).
177-
Written in Go, under MIT license.<br>
178-
Carapace-bin is a part of [Carapace](https://carapace.sh/) multi-shell completion library and binary.
179-
A high-level overview of carapace itself is available at <https://pixi.carapace.sh>.
175+
Details about the Git completion support can be found in issue [#99](https://github.com/carapace-sh/carapace-bin/issues/99).
176+
Written in Go under the MIT license.<br>
177+
Carapace-bin is a part of the [Carapace](https://carapace.sh/) multi-shell completion library and binary.
178+
A high-level overview of Carapace itself is available at <https://pixi.carapace.sh>.
180179
+ [git-random](https://git-random.olets.dev/): quickly build random-content Git
181180
graphs with a specified shape.
182-
It is a tool that can work as an aid for learning and experimenting with Git.
181+
This is a tool that can work as an aid for learning and experimenting with Git.
183182
Source code available [on GitHub](https://github.com/olets/git-random/).
184-
Written as single-file Bash script, under custom
183+
Written as a single-file Bash script under a custom
185184
CC BY-NC-SA 4.0 license with Hippocratic License v3 ethical requirements.
186185
+ The author mentions that this tool was inspired by seeing Lorna Jane Mitchell
187186
use Matthew J. McCullough's [generaterandomchanges](https://github.com/matthewmccullough/scripts/blob/master/generaterandomchanges)
@@ -213,7 +212,7 @@ __Git tools and sites__
213212
[3.12.8](https://help.github.com/[email protected]/admin/release-notes#3.12.8),
214213
[3.11.14](https://help.github.com/[email protected]/admin/release-notes#3.11.14),
215214
[3.10.16](https://help.github.com/[email protected]/admin/release-notes#3.10.16)
216-
+ GitLab [17.3.1, 17.2.4, 17.1.6](https://about.gitlab.com/releases/2024/08/21/patch-release-gitlab-17-3-1-released/)
215+
+ GitLab [17.3.1, 17.2.4, 17.1.6](https://about.gitlab.com/releases/2024/08/21/patch-release-gitlab-17-3-1-released/),
217216
[17.3](https://about.gitlab.com/releases/2024/08/15/gitlab-17-3-released/),
218217
[17.2.2, 17.1.4, 17.0.6](https://about.gitlab.com/releases/2024/08/07/patch-release-gitlab-17-2-2-released/)
219218
+ GitKraken [10.2.0](https://help.gitkraken.com/gitkraken-client/current/)

0 commit comments

Comments
 (0)