Skip to content

Commit 7fcb965

Browse files
newrengitster
authored andcommitted
RelNotes/2.26.0: fix various typos
Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent be8661a commit 7fcb965

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Documentation/RelNotes/2.26.0.txt

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

99
* "git rebase" uses a different backend that is based on the 'merge'
1010
machinery by default. There are a few known differences in the
11-
behaviour from the traditional machniery based on patch+apply.
11+
behaviour from the traditional machinery based on patch+apply.
1212

1313
If your workflow is negatively affected by this change, please
1414
report it to [email protected] so that we can take a look into
@@ -63,7 +63,7 @@ UI, Workflows & Features
6363
* "git rm" and "git stash" learns the new "--pathspec-from-file"
6464
option.
6565

66-
* "git am --short-current-patch" is a way to show the piece of e-mail
66+
* "git am --show-current-patch" is a way to show the piece of e-mail
6767
for the stopped step, which is not suitable to directly feed "git
6868
apply" (it is designed to be a good "git am" input). It learned a
6969
new option to show only the patch part.
@@ -79,7 +79,7 @@ Performance, Internal Implementation, Development Support etc.
7979
with tabs.
8080

8181
* The test-lint machinery knew to check "VAR=VAL shell_function"
82-
construct, but did not check "VAR= shell_funciton", which has been
82+
construct, but did not check "VAR= shell_function", which has been
8383
corrected.
8484

8585
* Replace "git config --bool" calls with "git config --type=bool" in
@@ -229,7 +229,7 @@ Fixes since v2.25
229229
* Unhelpful warning messages during documentation build have been squelched.
230230

231231
* "git rebase -i" identifies existing commits in its todo file with
232-
their abbreviated object name, which could become ambigous as it
232+
their abbreviated object name, which could become ambiguous as it
233233
goes to create new commits, and has a mechanism to avoid ambiguity
234234
in the main part of its execution. A few other cases however were
235235
not covered by the protection against ambiguity, which has been

0 commit comments

Comments
 (0)