diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-07-08 13:15:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-08 13:15:02 -0700 |
| commit | 018b85dead99d968b8e66e0ee6b74358a74015d6 (patch) | |
| tree | 9cbf8ff2082c68e3177f6b67984cae8136799a83 | |
| parent | a38c4c02e536b772526ad236b9887e28dab1d1e1 (diff) | |
| parent | 98c7656a18b032b92180c945484a51a15502821d (diff) | |
| download | git-018b85dead99d968b8e66e0ee6b74358a74015d6.tar.gz | |
Merge branch 'ar/more-typofix'
Typofixes.
* ar/more-typofix:
git-worktree.txt: fix typo in example path
t: fix typos in test messages
blame: correct name of config option in docs
| -rw-r--r-- | Documentation/config/blame.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-worktree.txt | 2 | ||||
| -rwxr-xr-x | t/t4258-am-quoted-cr.sh | 2 | ||||
| -rwxr-xr-x | t/t9001-send-email.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config/blame.txt b/Documentation/config/blame.txt index 9468e8599c..4d047c1790 100644 --- a/Documentation/config/blame.txt +++ b/Documentation/config/blame.txt @@ -27,7 +27,7 @@ blame.ignoreRevsFile:: file names will reset the list of ignored revisions. This option will be handled before the command line option `--ignore-revs-file`. -blame.markUnblamables:: +blame.markUnblamableLines:: Mark lines that were changed by an ignored revision that we could not attribute to another commit with a '*' in the output of linkgit:git-blame[1]. diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index f1bb1fa5f5..66e67e6cbf 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -387,7 +387,7 @@ These annotations are: ------------ $ git worktree list /path/to/linked-worktree abcd1234 [master] -/path/to/locked-worktreee acbd5678 (brancha) locked +/path/to/locked-worktree acbd5678 (brancha) locked /path/to/prunable-worktree 5678abc (detached HEAD) prunable ------------ diff --git a/t/t4258-am-quoted-cr.sh b/t/t4258-am-quoted-cr.sh index fb5071f914..201915b45a 100755 --- a/t/t4258-am-quoted-cr.sh +++ b/t/t4258-am-quoted-cr.sh @@ -26,7 +26,7 @@ test_expect_success 'am --quoted-cr=strip' ' git diff --exit-code HEAD two ' -test_expect_success 'am with config mailinfo.quotecr=strip' ' +test_expect_success 'am with config mailinfo.quotedCr=strip' ' test_might_fail git am --abort && git reset --hard one && test_config mailinfo.quotedCr strip && diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 30eff725a9..e9dc58f508 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -1829,7 +1829,7 @@ test_expect_success $PREREQ 'sendemail.aliasfiletype=mailrc' ' grep "^!somebody@example\.org!$" commandline1 ' -test_expect_success $PREREQ 'sendemail.aliasfile=~/.mailrc' ' +test_expect_success $PREREQ 'sendemail.aliasesfile=~/.mailrc' ' clean_fake_sendmail && echo "alias sbd someone@example.org" >"$HOME/.mailrc" && git config --replace-all sendemail.aliasesfile "~/.mailrc" && |