Nicolas Sebrecht <nicolas.s.dev@xxxxxx> writes: > +---no-scissors:: > + Do not obey to a scissors line (see linkgit:git-mailinfo[1]). > + obey is v.t. so "do not obey a scissors line" would be grammatical; I think "ignore scissors lines" would be better. > +--no-scissors:: > + Do not obey to a scissors line. This is only useful if mailinfo.scissors is > + enabled (see --scissors). Ditto; also it is useful in general if you do not know which way it is configured. Saying "_only_" is misleading. Ignore scissors lines; useful for overriding mailinfo.scissors settings. > diff --git a/git-am.sh b/git-am.sh > index 26ffe70..f242d1a 100755 > --- a/git-am.sh > +++ b/git-am.sh > @@ -16,6 +16,7 @@ s,signoff add a Signed-off-by line to the commit message > u,utf8 recode into utf8 (default) > k,keep pass -k flag to git-mailinfo > c,scissors strip everything before a scissors line > +no-scissors don't obey to a scissors line (default) > whitespace= pass it through git-apply > ignore-space-change pass it through git-apply > ignore-whitespace pass it through git-apply Do we want it to allow --no-no-scissors? I do not think this hunk is necessary at all. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html