Skip to content

Commit ee70b40

Browse files
tmzullingergitster
authored andcommitted
RelNotes: minor typo fixes in 2.22.0 draft
Signed-off-by: Todd Zullinger <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 874dd41 commit ee70b40

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Documentation/RelNotes/2.22.0.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ Performance, Internal Implementation, Development Support etc.
181181
been optimized out.
182182

183183
* Mechanically and systematically drop "extern" from function
184-
declarlation.
184+
declaration.
185185

186186
* The script to aggregate perf result unconditionally depended on
187187
libjson-perl even though it did not have to, which has been
@@ -270,7 +270,7 @@ Fixes since v2.21
270270
* On platforms where "git fetch" is killed with SIGPIPE (e.g. OSX),
271271
the upload-pack that runs on the other end that hangs up after
272272
detecting an error could cause "git fetch" to die with a signal,
273-
which led to a flakey test. "git fetch" now ignores SIGPIPE during
273+
which led to a flaky test. "git fetch" now ignores SIGPIPE during
274274
the network portion of its operation (this is not a problem as we
275275
check the return status from our write(2)s).
276276
(merge 143588949c jk/no-sigpipe-during-network-transport later to maint).
@@ -358,7 +358,7 @@ Fixes since v2.21
358358
(merge b5a0bd694c nd/read-tree-reset-doc later to maint).
359359

360360
* Code clean-up around a much-less-important-than-it-used-to-be
361-
update_server_info() funtion.
361+
update_server_info() function.
362362
(merge b3223761c8 jk/server-info-rabbit-hole later to maint).
363363

364364
* The message given when "git commit -a <paths>" errors out has been
@@ -450,7 +450,7 @@ Fixes since v2.21
450450
* When given a tag that points at a commit-ish, "git replace --graft"
451451
failed to peel the tag before writing a replace ref, which did not
452452
make sense because the old graft mechanism the feature wants to
453-
mimick only allowed to replace one commit object with another.
453+
mimic only allowed to replace one commit object with another.
454454
This has been fixed.
455455
(merge ee521ec4cb cc/replace-graft-peel-tags later to maint).
456456

@@ -500,7 +500,7 @@ Fixes since v2.21
500500
conflicts are resolved in working tree *.h files but before the
501501
resolved results are added to the index. This has been corrected.
502502

503-
* "git chery-pick" (and "revert" that shares the same runtime engine)
503+
* "git cherry-pick" (and "revert" that shares the same runtime engine)
504504
that deals with multiple commits got confused when the final step
505505
gets stopped with a conflict and the user concluded the sequence
506506
with "git commit". Attempt to fix it by cleaning up the state
@@ -535,7 +535,7 @@ Fixes since v2.21
535535
todo-list "rebase -i -r" uses should not be shown as a hex object
536536
name.
537537

538-
* A prerequiste check in the test suite to see if a working jgit is
538+
* A prerequisite check in the test suite to see if a working jgit is
539539
available was made more robust.
540540
(merge abd0f28983 tz/test-lib-check-working-jgit later to maint).
541541

0 commit comments

Comments
 (0)