Skip to content

Commit 3c9858c

Browse files
committed
rn-110: minor copy edit
1 parent c9cfa62 commit 3c9858c

File tree

1 file changed

+27
-29
lines changed

1 file changed

+27
-29
lines changed

rev_news/drafts/edition-110.md

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,28 @@ Welcome to the 110th 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 March 2024 and April 2024.
16+
This edition covers what happened during the months of March and April 2024.
1717

1818
## Discussions
1919

2020
### General
2121

2222
* [What's cooking in git.git (Mar 2024, #05; Tue, 19)](https://lore.kernel.org/git/[email protected]/)
2323

24-
Last March, Junio Hamano, the Git maintainer, sent one of the usual
24+
In March, Junio Hamano, the Git maintainer, sent one of the usual
2525
"What's cooking in git.git" emails that describe the current state
2626
of the patch series that might be merged into the development
2727
branches (mostly "master", "next" and "seen").
2828

2929
The patch series are listed in these emails along with some related
30-
information using a custom format. That format consists in the
31-
following elements:
30+
information in a custom format, including the following elements:
3231

3332
- a title line, for example:
3433

3534
> * bl/cherry-pick-empty (2024-03-11) 7 commits
3635
3736
where `bl` are the initials of the author, and `cherry-pick-empty`
38-
an actual title,
37+
the series title,
3938

4039
- a patch list, for example:
4140

@@ -66,22 +65,22 @@ This edition covers what happened during the months of March 2024 and April 2024
6665
automatically used to create the release notes that Junio prepares
6766
and sends when he creates a new release.
6867

69-
Brian Lyles, replied to Junio that the description of the patch
68+
Brian Lyles replied to Junio that the description of the patch
7069
series used as an example above, which Brian had sent, was "a little
7170
out-of-date". He suggested a different wording for it, and said that
7271
he was going to send a version 4 of the series.
7372

74-
Junio replied that the wording suggestion for the description was
73+
Junio said that the wording suggestion for the description was
7574
very much appreciated, and wondered if the project could adopt a
7675
better workflow where contributors could write a short description
7776
at the top of the cover letter of their patch series and that
78-
description could be packed up automatically by some tools to appear
77+
description could be picked up automatically by some tools to appear
7978
in Junio's "What's cooking in git.git" emails.
8079

81-
Brian Lyles replied that he agreed improving the process could be a
82-
good idea. He mentioned a strategy used by other projects which
83-
consists in adding an entry in a "CHANGELOG.NEXT.md" file in each
84-
important enough commit. At release time all the entries in that
80+
Brian Lyles agreed that improving the process could be a
81+
good idea. He mentioned a strategy used by other projects, namely
82+
adding an entry in a "CHANGELOG.NEXT.md" file in each
83+
important commit. At release time, all the entries in that
8584
file would be moved into a standard "CHANGELOG.md" file. He then
8685
showed how the entry in the "CHANGELOG.NEXT.md" file would look like
8786
for his series as an example.
@@ -108,7 +107,7 @@ This edition covers what happened during the months of March 2024 and April 2024
108107
suggested having guidelines, like for commit messages, to help
109108
authors and reviewers standardize the style of these descriptions.
110109

111-
In the meantime, in a separate email, Junio also replied that a
110+
In the meantime, in a separate email, Junio also pointed out that a
112111
"CHANGELOG.NEXT.md" file would make merges more difficult compared
113112
to having the description in the cover letter.
114113

@@ -121,7 +120,7 @@ This edition covers what happened during the months of March 2024 and April 2024
121120
phrase, or other structured text" to mark the description and make
122121
it easy to notice and extract.
123122

124-
Dragan Simic chimed into the discussion saying that writing the
123+
Dragan Simic joined the discussion saying that writing the
125124
description should not be a strict requirement and then agreed with
126125
Junio's patch. Max Gautier also chimed in, agreeing with Brian and
127126
Dragan about using a format to mark the description. Dragan replied
@@ -171,7 +170,7 @@ __Light reading__
171170
* Julia Evans continues her series of blog posts about Git, preparing for a new Git zine,
172171
with [Notes on git's error messages](https://jvns.ca/blog/2024/04/10/notes-on-git-error-messages/).
173172
There is also [Some Git poll results](https://jvns.ca/blog/2024/03/28/git-poll-results/)
174-
(which are, as admitted by the author, highly unscientific, and might be not representative).
173+
(which are, as admitted by the author, highly unscientific, and might not be representative).
175174
The first entry in this series of blog posts can be found in [Git Rev News Edition #103](https://git.github.io/rev_news/2023/09/30/edition-103/),
176175
and it continues since, edition after edition so far.
177176
* [Modern Git Commands and Features You Should Be Using](https://martinheinz.dev/blog/109)
@@ -188,19 +187,19 @@ __Light reading__
188187
* [How to get somebody fired using Git](https://dev.to/mauroaccorinti/how-to-get-somebody-fired-using-git-31if)
189188
(or: how to NOT use Git), by Mauro Accorinti on DEV\.to.
190189
* [What Happens on GitLab When You do git push?](https://nanmu.me/en/posts/2022/what-happens-on-gitlab-when-you-do-git-push/)
191-
by LI Zhennan, on personal blog.
190+
by Li Zhennan, on personal blog.
192191
* [Radicle: peer-to-peer collaboration with Git](https://lwn.net/Articles/966869/)
193192
article by Lars Wirzenius on LWN\.net.
194193
* [Radicle](https://radicle.xyz/) was first mentioned in [Git Rev News Edition #49](https://git.github.io/rev_news/2019/03/20/edition-49/), then in [Edition #70](https://git.github.io/rev_news/2020/12/26/edition-70/).
195-
There was also [article about Radicle from The New Stack](https://thenewstack.io/radicle-a-decentralized-alternative-to-github-for-web3/)
194+
There was also an [article about Radicle from The New Stack](https://thenewstack.io/radicle-a-decentralized-alternative-to-github-for-web3/)
196195
in [Git Rev News Edition #86](https://git.github.io/rev_news/2022/04/30/edition-86/).
197196
* Compare with [ForgeFed](https://notabug.org/peers/forgefed) (formerly GitPub),
198197
a federation protocol for software forges, mentioned in [Git Rev News Edition #69](https://git.github.io/rev_news/2020/11/27/edition-69/).
199198
* There is also [Gitstr](https://github.com/fiatjaf/gitstr), a tool to send and receive Git patches
200199
over [Nostr](https://nostr.com/), using [NIP-34](https://github.com/nostr-protocol/nips/pull/997)
201200
(mentioned in [Git Rev News Edition #109](https://git.github.io/rev_news/2024/03/31/edition-109/)),
202201
and [git-ssb](https://scuttlebot.io/apis/community/git-ssb.html)
203-
(see [git-ssb-intro](https://github.com/hackergrrl/git-ssb-intro) guide):
202+
(see the [git-ssb-intro](https://github.com/hackergrrl/git-ssb-intro) guide):
204203
decentralized Git repo hosting and issue tracking on [Secure-ScuttleButt (SSB)](https://www.scuttlebutt.nz/)
205204
(mentioned in [Git Rev News Edition #26](https://git.github.io/rev_news/2017/04/19/edition-26/)
206205
and [#40](https://git.github.io/rev_news/2018/06/20/edition-40/)).
@@ -225,31 +224,31 @@ __Git tools and sites__
225224
to help you make semantic Git commits. Written in JavaScript for Node.js.
226225
Can be installed standalone, or with [Commitizen](https://commitizen-tools.github.io/commitizen/)
227226
(which was mentioned in [Git Rev News Edition #72](https://git.github.io/rev_news/2021/02/27/edition-72/)).
228-
Has non-interactive mode; you can configure it (for example turning off emoji).
227+
Has non-interactive mode; is configurable (for example turning off emoji).
229228
* [Ydiff](https://github.com/ymattw/ydiff) is a term based tool
230229
to view _colored, incremental diff_ in a version controlled workspace
231230
(supports Git, Mercurial, Perforce and Subversion so far)
232231
or from stdin, with _side by side_ (similar to `diff -y`) and _auto pager_ support.
233-
Written in Python. (There also exists outdated [cdiff](https://github.com/amigrave/cdiff) fork of it.)
232+
Written in Python. (There also exists the outdated [cdiff](https://github.com/amigrave/cdiff) fork of it.)
234233
* [gws](https://github.com/StreakyCobra/gws) is a text user-interface colorful helper
235234
to manage workspaces composed of Git repositories. Written in bash.
236235
* [Giftless](https://giftless.datopian.com/) ([GitHub repo](https://github.com/datopian/giftless))
237236
is a Python implementation of a [Git LFS](https://git-lfs.com/) Server.
238237
It is designed with flexibility in mind, to allow pluggable storage backends,
239238
transfer methods and authentication methods.
240239
* [Gil](https://github.com/chronoxor/gil) (git links tool) is a tool to manage
241-
complex recursive repositories dependencies with cross references and cycles.
240+
complex recursive repository dependencies with cross references and cycles.
242241
This tool provides a solution to the _git recursive submodules dependency_ problem.
243242
Written in Python.
244243
* [git-subrepo](https://github.com/ingydotnet/git-subrepo) "clones" an external git repo
245244
into a subdirectory of your repo. It is an alternative to `git submodule` and `git subtree`.
246245
The subrepo history is _squashed_ into a single commit that contains the reference information.
247-
Recommended as replacement for no longer maintained [Git STree](https://deliciousinsights.github.io/git-stree/)
246+
Recommended as replacement for the (no longer maintained) [Git STree](https://deliciousinsights.github.io/git-stree/)
248247
project.
249248
* [tomono](https://github.com/hraban/tomono): Multi- to Monorepo Migration,
250249
is a script that merges multiple independent tiny repositories into a single “[monorepo](https://monorepo.tools/)”.
251250
Every original repo is moved into its own subdirectory, branches with the same name are all merged.
252-
* Can be considered the reverse of [splitsh/lite](https://github.com/splitsh/lite) tool, which goal is
251+
* Can be considered the reverse of [splitsh/lite](https://github.com/splitsh/lite) tool, whose goal is
253252
to make splitting a monolithic repository to read-only standalone repositories easy and fast
254253
(mentioned in [Git Rev News: Edition #16](https://git.github.io/rev_news/2016/06/15/edition-16/)).
255254
* [Gitdm](https://github.com/npalix/gitdm) (the "git data miner")
@@ -263,12 +262,11 @@ __Git tools and sites__
263262
See also [Lolcommits from around the world!](https://github.com/lolcommits/lolcommits/wiki/Lolcommits-from-around-the-world%21)
264263
page on the project Wiki.
265264
* [Steve's Jujutsu Tutorial](https://steveklabnik.github.io/jujutsu-tutorial/introduction/introduction.html).
266-
* [Jujutsu (jj)](https://github.com/martinvonz/jj) is a version control system,
265+
* [Jujutsu (jj)](https://github.com/martinvonz/jj) is a version control system
267266
first mentioned in [Git Rev News Edition #85](https://git.github.io/rev_news/2022/03/31/edition-85/);
268-
additionally, link to both [LWN.net article]((https://lwn.net/Articles/958468/)
269-
and [Jujutsu: A Git-Compatible VCS](https://www.youtube.com/watch?v=bx_LGilOuE4)
270-
video of Git Merge 2022 talk
271-
about this version control system can be found in
267+
additionally, links to the [LWN.net article]((https://lwn.net/Articles/958468/)
268+
and the [Jujutsu: A Git-Compatible VCS](https://www.youtube.com/watch?v=bx_LGilOuE4)
269+
talk about this version control system at Git Merge 2022 can be found in
272270
[Git Rev News Edition #107](https://git.github.io/rev_news/2024/01/31/edition-107/).
273271
* [Awesome Git](https://github.com/dictcp/awesome-git)
274272
is a curated list of amazingly awesome Git tools, resources and shiny things.
@@ -286,7 +284,7 @@ __Git tools and sites__
286284
[3.11.8](https://help.github.com/[email protected]/admin/release-notes#3.11.8),
287285
[3.10.10](https://help.github.com/[email protected]/admin/release-notes#3.10.10),
288286
[3.9.13](https://help.github.com/[email protected]/admin/release-notes#3.9.13)
289-
+ GitLab [16.11.1, 16.10.4, 16.9.6](https://about.gitlab.com/releases/2024/04/24/patch-release-gitlab-16-11-1-released/)
287+
+ GitLab [16.11.1, 16.10.4, 16.9.6](https://about.gitlab.com/releases/2024/04/24/patch-release-gitlab-16-11-1-released/),
290288
[16.11](https://about.gitlab.com/releases/2024/04/18/gitlab-16-11-released/),
291289
[16.10.3, 16.9.5, 16.8.7](https://about.gitlab.com/releases/2024/04/15/gitlab-16-10-3-released/),
292290
[16.10.2, 16.9.4, 16.8.6](https://about.gitlab.com/releases/2024/04/10/patch-release-gitlab-16-10-2-released/)

0 commit comments

Comments
 (0)