aboutsummaryrefslogtreecommitdiff
path: root/contrib/hooks/multimail/README
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-12 09:47:37 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-12 09:47:37 -0700
commite6b8f80653063cd41903c599ec9ca83be3d3afa5 (patch)
tree52d1e93fe3edc581275f92f98981c3103471af58 /contrib/hooks/multimail/README
parent2c44b7a53bf49430f231a71668d2a1c4ea9f5591 (diff)
parent2e3a16b279a9df2e498187871c67e623e12bc8a4 (diff)
downloadgit-e6b8f80653063cd41903c599ec9ca83be3d3afa5.tar.gz
git-e6b8f80653063cd41903c599ec9ca83be3d3afa5.tar.xz
Merge branch 'vs/typofix'
* vs/typofix: Spelling fixes
Diffstat (limited to 'contrib/hooks/multimail/README')
-rw-r--r--contrib/hooks/multimail/README4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README
index 0c91d19a5..22a23cdb9 100644
--- a/contrib/hooks/multimail/README
+++ b/contrib/hooks/multimail/README
@@ -294,7 +294,7 @@ multimailhook.htmlInIntro, multimailhook.htmlInFooter
like ``<a href="foo">link</a>``, the reader will see the HTML
source code and not a proper link.
- Set ``multimailhook.htmlInIntro`` to true to allow writting HTML
+ Set ``multimailhook.htmlInIntro`` to true to allow writing HTML
formatting in introduction templates. Similarly, set
``multimailhook.htmlInFooter`` for HTML in the footer.
@@ -516,7 +516,7 @@ multimailhook.commitLogOpts
multimailhook.dateSubstitute
String to use as a substitute for ``Date:`` in the output of ``git
- log`` while formatting commit messages. This is usefull to avoid
+ log`` while formatting commit messages. This is useful to avoid
emitting a line that can be interpreted by mailers as the start of
a cited message (Zimbra webmail in particular). Defaults to
``CommitDate:``. Set to an empty string or ``none`` to deactivate