Skip to content

Commit 02ca61e

Browse files
committed
Merge branch 'ar/more-typofix' into next
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
2 parents f16784c + 98c7656 commit 02ca61e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Documentation/config/blame.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ blame.ignoreRevsFile::
2727
file names will reset the list of ignored revisions. This option will
2828
be handled before the command line option `--ignore-revs-file`.
2929

30-
blame.markUnblamables::
30+
blame.markUnblamableLines::
3131
Mark lines that were changed by an ignored revision that we could not
3232
attribute to another commit with a '*' in the output of
3333
linkgit:git-blame[1].

Documentation/git-worktree.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ These annotations are:
387387
------------
388388
$ git worktree list
389389
/path/to/linked-worktree abcd1234 [master]
390-
/path/to/locked-worktreee acbd5678 (brancha) locked
390+
/path/to/locked-worktree acbd5678 (brancha) locked
391391
/path/to/prunable-worktree 5678abc (detached HEAD) prunable
392392
------------
393393

t/t4258-am-quoted-cr.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ test_expect_success 'am --quoted-cr=strip' '
2626
git diff --exit-code HEAD two
2727
'
2828

29-
test_expect_success 'am with config mailinfo.quotecr=strip' '
29+
test_expect_success 'am with config mailinfo.quotedCr=strip' '
3030
test_might_fail git am --abort &&
3131
git reset --hard one &&
3232
test_config mailinfo.quotedCr strip &&

t/t9001-send-email.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1829,7 +1829,7 @@ test_expect_success $PREREQ 'sendemail.aliasfiletype=mailrc' '
18291829
grep "^!somebody@example\.org!$" commandline1
18301830
'
18311831

1832-
test_expect_success $PREREQ 'sendemail.aliasfile=~/.mailrc' '
1832+
test_expect_success $PREREQ 'sendemail.aliasesfile=~/.mailrc' '
18331833
clean_fake_sendmail &&
18341834
echo "alias sbd [email protected]" >"$HOME/.mailrc" &&
18351835
git config --replace-all sendemail.aliasesfile "~/.mailrc" &&

0 commit comments

Comments
 (0)