All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Fredrik Gustafsson <iveqy@iveqy.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Clarify documentation on commit message strip
Date: Fri, 24 Apr 2015 21:36:32 -0700	[thread overview]
Message-ID: <xmqqmw1w259r.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1429905998-9089-1-git-send-email-iveqy@iveqy.com> (Fredrik Gustafsson's message of "Fri, 24 Apr 2015 22:06:38 +0200")

Fredrik Gustafsson <iveqy@iveqy.com> writes:

> diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
> index 617e29b..e31d828 100644
> --- a/Documentation/git-commit.txt
> +++ b/Documentation/git-commit.txt
> @@ -180,8 +180,9 @@ OPTIONS
>  +
>  --
>  strip::
> -	Strip leading and trailing empty lines, trailing whitespace, and
> -	#commentary and collapse consecutive empty lines.
> +	Strip leading and trailing empty lines, trailing whitespace,
> +	#commentary, unified diff added with `-v` and collapse
> +	consecutive empty lines.

I'd prefer the description not to be _too_ explicit e.g. by
mentioning "unified diff", etc.

Personally I think it is sufficient to do s/#comment/comment/ to the
existing text, without doing anything else.  What is "commentary" to
be removed is fairly clear in the contents given to the user in the
editor.

  reply	other threads:[~2015-04-25  4:36 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-24 20:06 [PATCH] Clarify documentation on commit message strip Fredrik Gustafsson
2015-04-25  4:36 ` Junio C Hamano [this message]
2015-04-25  5:42   ` Fredrik Gustafsson
2015-04-27 17:31     ` Junio C Hamano
2015-04-27 18:13       ` Fredrik Gustafsson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqmw1w259r.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=iveqy@iveqy.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.