From: Junio C Hamano Date: Sat, 25 Apr 2015 04:36:32 GMT Subject: Re: [PATCH] Clarify documentation on commit message strip Message-ID: In-Reply-To: <1429905998-9089-1-git-send-email-iveqy@iveqy.com> Fredrik Gustafsson 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.