Merge branch 'jk/xdiff-memory-limits' into maint-2.3

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index f4eea28dc4d03e02f9af3eedba5d15743b8553f6..0d8ba48f792ae82237a56aa0dd2aca03f4e16020 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -52,7 +52,8 @@ OPTIONS
 -c::
 --scissors::
        Remove everything in body before a scissors line (see
-       linkgit:git-mailinfo[1]).
+       linkgit:git-mailinfo[1]). Can be activated by default using
+       the `mailinfo.scissors` configuration variable.
 
 --no-scissors::
        Ignore scissors lines (see linkgit:git-mailinfo[1]).