summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-17 21:38:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-05-17 21:38:38 (GMT)
commit5bfc50d6fe58ec38f55efff43220dc3274b4629b (patch)
tree76e2724b2cdfa6b7b6920c5805f5755a39b0941d /Documentation
parent372731810e06ce69c4752e27f0f4ed7f64b2019c (diff)
parentdee2303b1a9a61fd516fee7a7a4d59cd6d82f302 (diff)
downloadgit-5bfc50d6fe58ec38f55efff43220dc3274b4629b.zip
git-5bfc50d6fe58ec38f55efff43220dc3274b4629b.tar.gz
git-5bfc50d6fe58ec38f55efff43220dc3274b4629b.tar.bz2
Merge branch 'va/mailinfo-doc-typofix'
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.