Anonymous committed 434a6db

add documentation for mailinfo.scissors and '--no-scissors'

Signed-off-by: Nicolas Sebrecht <>
Signed-off-by: Junio C Hamano <>

Comments (0)

Files changed (3)


 	 [--3way] [--interactive] [--committer-date-is-author-date]
 	 [--ignore-date] [--ignore-space-change | --ignore-whitespace]
 	 [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
-	 [--reject] [-q | --quiet] [--scissors]
+	 [--reject] [-q | --quiet] [--scissors | --no-scissors]
 	 [<mbox> | <Maildir>...]
 'git am' (--skip | --resolved | --abort)
 	Remove everything in body before a scissors line (see
+	Ignore scissors lines (see linkgit:git-mailinfo[1]).
 	Be quiet. Only print error messages.


 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.
+	Ignore scissors lines. Useful for overriding mailinfo.scissors settings.
 	The commit log message extracted from e-mail, usually


 static const char mailinfo_usage[] =
-	"git mailinfo [-k] [-u | --encoding=<encoding> | -n] [--scissors] msg patch < mail >info";
+	"git mailinfo [-k] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] msg patch < mail >info";
 int cmd_mailinfo(int argc, const char **argv, const char *prefix)