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
This commit is contained in:
commit
018b85dead
@ -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].
|
||||
|
@ -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
|
||||
------------
|
||||
|
||||
|
@ -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 &&
|
||||
|
@ -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" &&
|
||||
|
Loading…
Reference in New Issue
Block a user