aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/config/mailinfo.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/config/mailinfo.txt')
-rw-r--r--Documentation/config/mailinfo.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config/mailinfo.txt b/Documentation/config/mailinfo.txt
index 3854d4ae37..ec3a5d81f7 100644
--- a/Documentation/config/mailinfo.txt
+++ b/Documentation/config/mailinfo.txt
@@ -1,6 +1,6 @@
mailinfo.scissors::
If true, makes linkgit:git-mailinfo[1] (and therefore
linkgit:git-am[1]) act by default as if the --scissors option
- was provided on the command-line. When active, this features
+ was provided on the command-line. When active, this feature
removes everything from the message body before a scissors
line (i.e. consisting mainly of ">8", "8<" and "-").