undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ar/more-typofix'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2021-07-08 13:15:02 -07:00
commit 018b85dead
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config/blame.txt
View File

@ -27,7 +27,7 @@ blame.ignoreRevsFile::
file names will reset the list of ignored revisions. This option will file names will reset the list of ignored revisions. This option will
be handled before the command line option `--ignore-revs-file`. 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 Mark lines that were changed by an ignored revision that we could not
attribute to another commit with a '*' in the output of attribute to another commit with a '*' in the output of
linkgit:git-blame[1]. linkgit:git-blame[1].

2
Documentation/git-worktree.txt
View File

@ -387,7 +387,7 @@ These annotations are:
------------ ------------
$ git worktree list $ git worktree list
/path/to/linked-worktree abcd1234 [master] /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 /path/to/prunable-worktree 5678abc (detached HEAD) prunable
------------ ------------

2
t/t4258-am-quoted-cr.sh
View File

@ -26,7 +26,7 @@ test_expect_success 'am --quoted-cr=strip' '
git diff --exit-code HEAD two 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 && test_might_fail git am --abort &&
git reset --hard one && git reset --hard one &&
test_config mailinfo.quotedCr strip && test_config mailinfo.quotedCr strip &&

2
t/t9001-send-email.sh
View File

@ -1829,7 +1829,7 @@ test_expect_success $PREREQ 'sendemail.aliasfiletype=mailrc' '
grep "^!somebody@example\.org!$" commandline1 grep "^!somebody@example\.org!$" commandline1
' '
test_expect_success $PREREQ 'sendemail.aliasfile=~/.mailrc' ' test_expect_success $PREREQ 'sendemail.aliasesfile=~/.mailrc' '
clean_fake_sendmail && clean_fake_sendmail &&
echo "alias sbd someone@example.org" >"$HOME/.mailrc" && echo "alias sbd someone@example.org" >"$HOME/.mailrc" &&
git config --replace-all sendemail.aliasesfile "~/.mailrc" && git config --replace-all sendemail.aliasesfile "~/.mailrc" &&