Merge branch 'va/mailinfo-doc-typofix' into maint

Typofix.

* va/mailinfo-doc-typofix:
  Documentation/git-mailinfo: fix typo
This commit is contained in:
Junio C Hamano 2016-05-26 13:17:13 -07:00
commit 31efe2a8a8

View file

@ -85,7 +85,7 @@ with comments and suggestions on the message you are responding to, and to
conclude it with a patch submission, separating the discussion and the conclude it with a patch submission, separating the discussion and the
beginning of the proposed commit log message with a scissors line. beginning of the proposed commit log message with a scissors line.
+ +
This can enabled by default with the configuration option mailinfo.scissors. This can be enabled by default with the configuration option mailinfo.scissors.
--no-scissors:: --no-scissors::
Ignore scissors lines. Useful for overriding mailinfo.scissors settings. Ignore scissors lines. Useful for overriding mailinfo.scissors settings.