summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-26 20:17:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-05-26 20:17:14 (GMT)
commit31efe2a8a844834ee81be6e8f9c3dae34fb47aa2 (patch)
treedea2251c1e4c1bbd48a24406f2bfd4332bbac592 /Documentation
parentadbcfe6547fda8fe66618355a8a2031ac27d1a90 (diff)
parentdee2303b1a9a61fd516fee7a7a4d59cd6d82f302 (diff)
downloadgit-31efe2a8a844834ee81be6e8f9c3dae34fb47aa2.zip
git-31efe2a8a844834ee81be6e8f9c3dae34fb47aa2.tar.gz
git-31efe2a8a844834ee81be6e8f9c3dae34fb47aa2.tar.bz2
Merge branch 'va/mailinfo-doc-typofix' into maint
Typofix. * va/mailinfo-doc-typofix: Documentation/git-mailinfo: fix typo
Diffstat (limited to 'Documentation')
-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 0947084..3bbc731 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.