@@ -13,7 +13,7 @@ Welcome to the 112th edition of [Git Rev News](https://git.github.io/rev_news/re
13
13
a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to
14
14
subscribe, see [ the Git Rev News page] ( https://git.github.io/rev_news/rev_news/ ) on [ git.github.io] ( http://git.github.io ) .
15
15
16
- This edition covers what happened during the months of May 2024 and June 2024.
16
+ This edition covers what happened during the months of May and June 2024.
17
17
18
18
## Discussions
19
19
@@ -54,9 +54,9 @@ This edition covers what happened during the months of May 2024 and June 2024.
54
54
55
55
So Junio was happy that "somebody has bit it ;-)" and suggested a
56
56
number of topics that could be added to the document Patrick wanted
57
- to create. This started a discussion about deprecating or not some
58
- features like the ` restore ` , ` switch ` , ` submodules ` and ` worktrees `
59
- subcommands.
57
+ to create. This started a discussion about the possibility of
58
+ deprecating some features, such as the ` restore ` , ` switch ` ,
59
+ ` submodules ` and ` worktrees ` subcommands.
60
60
61
61
In the RFC patch to add the document, Patrick mentioned some of the
62
62
topics suggested by Junio, but not others that seemed controversial
@@ -74,7 +74,7 @@ This edition covers what happened during the months of May 2024 and June 2024.
74
74
section for the features we don't want to drop.
75
75
76
76
Dragan Simic, who participated in the previous discussions in the
77
- ` git config ` thread, repeated that he didn't want to see neither
77
+ ` git config ` thread, repeated that he didn't want to see any of
78
78
` git restore ` , ` git switch ` or ` git checkout ` deprecated, which
79
79
Patrick agreed shouldn't be done.
80
80
@@ -93,15 +93,15 @@ This edition covers what happened during the months of May 2024 and June 2024.
93
93
94
94
Patrick then sent a
95
95
[ version 2 of his patch] ( https://lore.kernel.org/git/2ef53ff98b12fe9373a15ec3a795235f040d9049.1715667067.git.ps@pks.im/ )
96
- which added section about features "that are _ not_ to be
97
- deprecated". Some features were also added while deprecating the
98
- hook directory was removed for now .
96
+ adding a section about features "that are _ not_ to be
97
+ deprecated" and proposing some further deprecations, while withdrawing
98
+ the $GITDIR/hooks directory deprecation proposal .
99
99
100
- Karthik Nayak replied to the version 2 patch listing a number of
101
- commands not mentioned in the document that do similar things which
100
+ Karthik Nayak replied to the version 2 patch, listing a number of
101
+ commands not mentioned in the document that do similar things, which
102
102
might indicate that some of them could be deprecated too. Patrick,
103
103
Junio and Dragan discussed these commands, but decided that only
104
- ` git pickaxe ` , which is an alias for ` git blame ` could be removed
104
+ ` git pickaxe ` , which is an alias for ` git blame ` , could be removed
105
105
for now.
106
106
107
107
So Patrick sent a
@@ -116,11 +116,11 @@ This edition covers what happened during the months of May 2024 and June 2024.
116
116
Patrick sent a
117
117
[ version 4
] ( https://lore.kernel.org/git/[email protected] / )
118
118
where the single patch had been broken down into 4 patches. In the
119
- process a lot of the proposed deprecation from the previous version
119
+ process a lot of the proposed deprecations from the previous version
120
120
were removed and the document name was changed from
121
121
"UpcomingBreakingChanges.md" to "BreakingChanges.md" as some changes
122
122
listed in the "Superseded features that will not be deprecated"
123
- section should not be considered as upcoming.
123
+ section should not be considered upcoming.
124
124
125
125
The goal was to introduce the document in a skeletal form in the
126
126
first patch and then add only one item to each of the three sections
@@ -133,9 +133,8 @@ This edition covers what happened during the months of May 2024 and June 2024.
133
133
134
134
Patrick sent a
135
135
[ version 5 of the patch series
] ( https://lore.kernel.org/git/[email protected] / )
136
-
137
136
where the main change was that the document was converted to
138
- AsciiDoc instead of MarkDown and renamed from "BreakingChanges.md"
137
+ AsciiDoc instead of Markdown and renamed from "BreakingChanges.md"
139
138
to "BreakingChanges.txt" for format compatibility with most other
140
139
documents in the codebase.
141
140
@@ -145,7 +144,7 @@ This edition covers what happened during the months of May 2024 and June 2024.
145
144
146
145
Junio then suggested a few more small improvements which Patrick
147
146
integrated into the
148
- [ version
6 of the patch series
] ( https://lore.kernel.org/git/[email protected] / )
147
+ [ version
7 of the patch series
] ( https://lore.kernel.org/git/[email protected] / )
149
148
which was later merged into the 'master' branch.
150
149
151
150
<!-- -
@@ -170,13 +169,13 @@ __Light reading__
170
169
and other links that were mentioned in that edition.
171
170
* [ Git Workflows for API Technical Writers] ( https://bump.sh/blog/git-workflows-for-api-technical-writers )
172
171
by James Higginbotham on Bump\. sh.
173
- Mentions [ Bump.sh] ( https://bump.sh/ ) API doc platform for tech writers and engineers
172
+ Mentions [ Bump.sh] ( https://bump.sh/ ) , an API doc platform for tech writers and engineers,
174
173
at the end of the article.
175
174
* [ What is Git? Our beginner’s guide to version control] ( https://github.blog/2024-05-27-what-is-git-our-beginners-guide-to-version-control/ ) and
176
175
[ Top 12 Git commands every developer must know] ( https://github.blog/2024-06-10-top-12-git-commands-every-developer-must-know/ )
177
- by Kedasha Kerr on GitHub Blog. This blog post accompany the
176
+ by Kedasha Kerr on GitHub Blog. This blog post accompanies the
178
177
[ GitHub for Beginners] ( https://youtube.com/playlist?list=PL0lo9MOBetEFcp4SCWinBdpml9B2U25-f&feature=shared )
179
- series (playlist on YouTube).
178
+ series (YouTube playlist ).
180
179
* [ Pull Request vs. Merge Request: Essential Differences] ( https://www.codium.ai/blog/pull-request-vs-merge-request-essential-differences/ )
181
180
by CodiumAI Team (with some promotion of their AI tool at the end of the article).
182
181
* [ Stop Wasting Hours! Git Bisect: Your Ultimate Bug Hunting Tool] ( https://ionixjunior.dev/en/stop-wasting-hours-git-bisect-your-ultimate-bug-hunting-tool/ )
@@ -185,7 +184,7 @@ __Light reading__
185
184
* [ The Magic of Git Stash: How It Saved My Day] ( https://dev.to/waqaryounis7564/the-magic-of-git-stash-how-it-saved-my-day-119k )
186
185
by waqaryounis7564 on DEV\. to.
187
186
* [ Prevent Hidden Merge Conflicts] ( https://dev.to/shinigami92/prevent-hidden-merge-conflicts-2lem )
188
- by Shinnigami on DEV\. to; though described solutions might require some more thought
187
+ by Shinnigami on DEV\. to; but note that the described solutions might warrant some more thought
189
188
(linearizing history by requiring rebase instead of merge to integrate changes
190
189
versus requiring branch to be up to date before merging), and are not the only possible
191
190
solutions (for example: post-merge checks).
@@ -197,11 +196,10 @@ __Light reading__
197
196
* [ Ten Things You Didn’t Know Git And GitHub Could Do] ( https://owenou.com/ten-things-you-didnt-know-git-and-github-could-do/ )
198
197
by Owen Ou on Owen Ou's blog (2012).
199
198
* [ Versioning FreeCAD files with git] ( https://blog.lambda.cx/posts/freecad-and-git/ )
200
- (which are zip archives containing text documents) by Dante Catalfamo on lambda.cx blog (2021).
201
-
199
+ (FreeCAD files are zip archives containing text documents) by Dante Catalfamo on lambda.cx blog (2021).
202
200
* [ Programming in Unison] ( https://lwn.net/Articles/978955/ )
203
201
by Daroc Alden on LWN\. net ([ free subscriber link] ( https://lwn.net/SubscriberLink/978955/cd8dffc792b86313/ ) ).
204
- [ Unison] ( https://www.unison-lang.org/ ) is a MIT-licensed programming language,
202
+ [ Unison] ( https://www.unison-lang.org/ ) is an MIT-licensed programming language,
205
203
where programs are stored in an append-only, content-addressed database
206
204
(though still displayed to the user for editing as text, using the editor of their choice)...
207
205
just like information about project versions is stored in Git.
@@ -214,7 +212,7 @@ __Git tools and sites__
214
212
215
213
* [ setuptools-scm] ( https://github.com/pypa/setuptools_scm )
216
214
is a tool that extracts Python package versions from ` git ` or ` hg ` metadata
217
- instead of declaring them as the version argument, or in an SCM managed file.
215
+ instead of declaring them as the version argument or in an SCM managed file.
218
216
Additionally, it provides setuptools with a list of files that are managed by the SCM
219
217
(i.e. it automatically adds all of the SCM-managed files to the sdist).
220
218
Unwanted files must be excluded via ` MANIFEST.in ` .
@@ -223,22 +221,22 @@ __Git tools and sites__
223
221
and the [ stable version documentation] ( https://setuptools-scm.readthedocs.io/en/stable/ )
224
222
are available on Read the Docs).
225
223
* [ ` piku ` ] ( https://piku.github.io/ ) , which was inspired by [ ` dokku ` ] ( https://dokku.com/ ) ,
226
- allows you do ` git push ` deployments to your own servers, no matter how small they are.
224
+ allows you to do ` git push ` deployments to your own servers, no matter how small they are.
227
225
An open source PaaS (Platform as a Service) alternative to services such as Heroku.
228
226
Written in Python.
229
227
* [ gitchangelog] ( https://github.com/vaab/gitchangelog ) is a tool that
230
228
creates a changelog from git log history. Written in Python;
231
- though it is no longer actively developed (version 3.0.4 is from 2018).
229
+ no longer actively developed (version 3.0.4 is from 2018).
232
230
* Compare with for example [ git-cliff] ( https://git-cliff.org/ ) changelog generator,
233
231
mentioned in [ Git Rev News Edition #108 ] ( https://git.github.io/rev_news/2024/02/29/edition-108/ ) .
234
232
* [ git-open-remote] ( https://github.com/masukomi/masuconfigs/blob/master/bin/git-scripts/git-open-remote )
235
- is a shell script by [ masukomi] ( https://masukomi.org ) open the web page for the repo's remote(s).
233
+ is a shell script by [ masukomi] ( https://masukomi.org ) to open the web page for the repo's remote(s).
236
234
With this script you can simply cd into a git repo and type ` git open-remote ` .
237
235
Requires [ ` open ` ] ( https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/open.1.html )
238
- or [ ` xdg-open ` ] ( https://linux.die.net/man/1/xdg-open ) installed to open the web browser
239
- (and aliased or linked to ` open ` command in the latter case) ,
240
- and [ charm gum] ( https://github.com/charmbracelet/gum ) to implement UI
241
- for choosing the remote if the git repo has more than one remote.
236
+ or [ ` xdg-open ` ] ( https://linux.die.net/man/1/xdg-open )
237
+ (aliased or linked to ` open ` ) to open the web browser ,
238
+ and [ charm gum] ( https://github.com/charmbracelet/gum )
239
+ to implement the selection UI when the git repo has more than one remote.
242
240
* [ Git EOL Conversion Diagram] ( https://gist.github.com/DecimalTurn/3f99a3903366bf9fb2c1f513bd3c5a83 ) for checkout
243
241
as Gist providing [ SVG version] ( https://raw.githubusercontent.com/gist/DecimalTurn/3f99a3903366bf9fb2c1f513bd3c5a83/raw/d54d0e842c1f22e0b04d7a044dde1489993d87bf/Git-EOL-Conversion-Diagram.svg )
244
242
and [ editable version on Mindmup] ( https://app.mindmup.com/map/_free/2024/06/982eaeb032cf11ef93d0a9d7af4d6195 ) ,
0 commit comments