@matheusbsbs / matheus-bagliano / commits / 7fcb965970
Fork 0

RelNotes/2.26.0: fix various typos

Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Mar 18, 2020 at 21:18 UTC 7fcb9659703b9dd611acb7cb85752be8ba4dcf31
1 file changed +4 -4
Documentation/RelNotes/2.26.0.txt
+4 -4
@@ -8,7 +8,7 @@ Backward compatibility notes
8
9 * "git rebase" uses a different backend that is based on the 'merge'
10 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.
12
13 If your workflow is negatively affected by this change, please
14 report it to git@vger.kernel.org so that we can take a look into
@@ -63,7 +63,7 @@ UI, Workflows & Features
63 * "git rm" and "git stash" learns the new "--pathspec-from-file"
64 option.
65
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
67 for the stopped step, which is not suitable to directly feed "git
68 apply" (it is designed to be a good "git am" input). It learned a
69 new option to show only the patch part.
@@ -79,7 +79,7 @@ Performance, Internal Implementation, Development Support etc.
79 with tabs.
80
81 * 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
83 corrected.
84
85 * Replace "git config --bool" calls with "git config --type=bool" in
@@ -229,7 +229,7 @@ Fixes since v2.25
229 * Unhelpful warning messages during documentation build have been squelched.
230
231 * "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
233 goes to create new commits, and has a mechanism to avoid ambiguity
234 in the main part of its execution. A few other cases however were
235 not covered by the protection against ambiguity, which has been