The 11/09/09, Junio C Hamano wrote:
> 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.
This version includes the above comments.
Thanks,
-- >8 --
Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@xxxxxx>
---
Documentation/git-am.txt | 5 ++++-
Documentation/git-mailinfo.txt | 5 +++++
builtin-mailinfo.c | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 87781f4..06e6ea6 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -13,7 +13,7 @@ SYNOPSIS
[--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)
@@ -44,6 +44,9 @@ OPTIONS
Remove everything in body before a scissors line (see
linkgit:git-mailinfo[1]).
+---no-scissors::
+ ignore scissors lines (see linkgit:git-mailinfo[1]).
+
-q::
--quiet::
Be quiet. Only print error messages.
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index 823ab82..d1f9cb8 100644
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@ -62,6 +62,11 @@ This is useful if you want to begin your message in a discussion thread
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.
+
+--no-scissors::
+ ignore scissors lines; useful for overriding mailinfo.scissors settings.
<msg>::
The commit log message extracted from e-mail, usually
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index 7d22fd7..d498b1c 100644
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -1004,7 +1004,7 @@ static int git_mailinfo_config(const char *var, const char *value, void *unused)
}
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)
{
--
1.6.5.rc0.166.g46a82
--
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