Skip to content

Commit be5a750

Browse files
committed
A bit of updates post -rc0
Signed-off-by: Junio C Hamano <[email protected]>
1 parent bf2f63a commit be5a750

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

Documentation/RelNotes/2.11.0.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Backward compatibility notes.
2121

2222
* The default abbreviation length, which has historically been 7, now
2323
scales as the repository grows, using the approximate number of
24-
objects in the reopsitory and a bit of math around the birthday
24+
objects in the repository and a bit of math around the birthday
2525
paradox. The logic suggests to use 12 hexdigits for the Linux
2626
kernel, and 9 to 10 for Git itself.
2727

@@ -45,10 +45,10 @@ UI, Workflows & Features
4545
which was not intuitive, given that "git nosuchcommand" said "git:
4646
'nosuchcommand' is not a git command".
4747

48-
* "git clone --resurse-submodules --reference $path $URL" is a way to
48+
* "git clone --recurse-submodules --reference $path $URL" is a way to
4949
reduce network transfer cost by borrowing objects in an existing
5050
$path repository when cloning the superproject from $URL; it
51-
learned to also peek into $path for presense of corresponding
51+
learned to also peek into $path for presence of corresponding
5252
repositories of submodules and borrow objects from there when able.
5353

5454
* The "git diff --submodule={short,log}" mechanism has been enhanced
@@ -73,7 +73,7 @@ UI, Workflows & Features
7373

7474
* In some projects, it is common to use "[RFC PATCH]" as the subject
7575
prefix for a patch meant for discussion rather than application. A
76-
new option "--rfc" was a short-hand for "--subject-prefix=RFC PATCH"
76+
new option "--rfc" is a short-hand for "--subject-prefix=RFC PATCH"
7777
to help the participants of such projects.
7878

7979
* "git add --chmod=+x <pathspec>" added recently only toggled the
@@ -96,8 +96,8 @@ UI, Workflows & Features
9696

9797
* When given an abbreviated object name that is not (or more
9898
realistically, "no longer") unique, we gave a fatal error
99-
"ambiguous argument". This error is now accompanied by hints that
100-
lists the objects that begins with the given prefix. During the
99+
"ambiguous argument". This error is now accompanied by a hint that
100+
lists the objects beginning with the given prefix. During the
101101
course of development of this new feature, numerous minor bugs were
102102
uncovered and corrected, the most notable one of which is that we
103103
gave "short SHA1 xxxx is ambiguous." twice without good reason.
@@ -330,7 +330,7 @@ notes for details).
330330
* "git diff -W" output needs to extend the context backward to
331331
include the header line of the current function and also forward to
332332
include the body of the entire current function up to the header
333-
line of the next one. This process may have to merge to adjacent
333+
line of the next one. This process may have to merge two adjacent
334334
hunks, but the code forgot to do so in some cases.
335335

336336
* Performance tests done via "t/perf" did not use the same set of
@@ -575,3 +575,4 @@ notes for details).
575575
(merge de9f7fa3b0 rs/commit-pptr-simplify later to maint).
576576
(merge 4259d693fc sc/fmt-merge-msg-doc-markup-fix later to maint).
577577
(merge 28fab7b23d nd/test-helpers later to maint).
578+
(merge c2bb0c1d1e rs/cocci later to maint).

0 commit comments

Comments
 (0)