Git fork

RelNotes/2.26.0: fix various typos

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

authored by

Elijah Newren and committed by
Junio C Hamano
7fcb9659 be8661a3

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