@@ -21,7 +21,7 @@ Backward compatibility notes.
21
21
22
22
* The default abbreviation length, which has historically been 7, now
23
23
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
25
25
paradox. The logic suggests to use 12 hexdigits for the Linux
26
26
kernel, and 9 to 10 for Git itself.
27
27
@@ -45,10 +45,10 @@ UI, Workflows & Features
45
45
which was not intuitive, given that "git nosuchcommand" said "git:
46
46
'nosuchcommand' is not a git command".
47
47
48
- * "git clone --resurse -submodules --reference $path $URL" is a way to
48
+ * "git clone --recurse -submodules --reference $path $URL" is a way to
49
49
reduce network transfer cost by borrowing objects in an existing
50
50
$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
52
52
repositories of submodules and borrow objects from there when able.
53
53
54
54
* The "git diff --submodule={short,log}" mechanism has been enhanced
@@ -73,7 +73,7 @@ UI, Workflows & Features
73
73
74
74
* In some projects, it is common to use "[RFC PATCH]" as the subject
75
75
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"
77
77
to help the participants of such projects.
78
78
79
79
* "git add --chmod=+x <pathspec>" added recently only toggled the
@@ -96,8 +96,8 @@ UI, Workflows & Features
96
96
97
97
* When given an abbreviated object name that is not (or more
98
98
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
101
101
course of development of this new feature, numerous minor bugs were
102
102
uncovered and corrected, the most notable one of which is that we
103
103
gave "short SHA1 xxxx is ambiguous." twice without good reason.
@@ -330,7 +330,7 @@ notes for details).
330
330
* "git diff -W" output needs to extend the context backward to
331
331
include the header line of the current function and also forward to
332
332
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
334
334
hunks, but the code forgot to do so in some cases.
335
335
336
336
* Performance tests done via "t/perf" did not use the same set of
@@ -575,3 +575,4 @@ notes for details).
575
575
(merge de9f7fa3b0 rs/commit-pptr-simplify later to maint).
576
576
(merge 4259d693fc sc/fmt-merge-msg-doc-markup-fix later to maint).
577
577
(merge 28fab7b23d nd/test-helpers later to maint).
578
+ (merge c2bb0c1d1e rs/cocci later to maint).
0 commit comments