File tree Expand file tree Collapse file tree 4 files changed +4
-4
lines changed Expand file tree Collapse file tree 4 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ blame.ignoreRevsFile::
27
27
file names will reset the list of ignored revisions. This option will
28
28
be handled before the command line option `--ignore-revs-file`.
29
29
30
- blame.markUnblamables ::
30
+ blame.markUnblamableLines ::
31
31
Mark lines that were changed by an ignored revision that we could not
32
32
attribute to another commit with a '*' in the output of
33
33
linkgit:git-blame[1].
Original file line number Diff line number Diff line change @@ -387,7 +387,7 @@ These annotations are:
387
387
------------
388
388
$ git worktree list
389
389
/path/to/linked-worktree abcd1234 [master]
390
- /path/to/locked-worktreee acbd5678 (brancha) locked
390
+ /path/to/locked-worktree acbd5678 (brancha) locked
391
391
/path/to/prunable-worktree 5678abc (detached HEAD) prunable
392
392
------------
393
393
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ test_expect_success 'am --quoted-cr=strip' '
26
26
git diff --exit-code HEAD two
27
27
'
28
28
29
- test_expect_success ' am with config mailinfo.quotecr =strip' '
29
+ test_expect_success ' am with config mailinfo.quotedCr =strip' '
30
30
test_might_fail git am --abort &&
31
31
git reset --hard one &&
32
32
test_config mailinfo.quotedCr strip &&
Original file line number Diff line number Diff line change @@ -1829,7 +1829,7 @@ test_expect_success $PREREQ 'sendemail.aliasfiletype=mailrc' '
1829
1829
grep "^!somebody@example\.org!$" commandline1
1830
1830
'
1831
1831
1832
- test_expect_success $PREREQ ' sendemail.aliasfile =~/.mailrc' '
1832
+ test_expect_success $PREREQ ' sendemail.aliasesfile =~/.mailrc' '
1833
1833
clean_fake_sendmail &&
1834
1834
echo "alias sbd [email protected] " >"$HOME/.mailrc" &&
1835
1835
git config --replace-all sendemail.aliasesfile "~/.mailrc" &&
You can’t perform that action at this time.
0 commit comments