summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-26 13:17:13 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-26 13:17:14 -0700
commit31efe2a8a844834ee81be6e8f9c3dae34fb47aa2 (patch)
treedea2251c1e4c1bbd48a24406f2bfd4332bbac592
parentMerge branch 'maint-2.7' into maint (diff)
parentDocumentation/git-mailinfo: fix typo (diff)
downloadtgif-31efe2a8a844834ee81be6e8f9c3dae34fb47aa2.tar.xz
Merge branch 'va/mailinfo-doc-typofix' into maint
Typofix. * va/mailinfo-doc-typofix: Documentation/git-mailinfo: fix typo
-rw-r--r--Documentation/git-mailinfo.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index 0947084140..3bbc731f67 100644
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@ -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
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::
Ignore scissors lines. Useful for overriding mailinfo.scissors settings.