Merge branch 'maint'

diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt
index 3a03dd04106d45cc3c233230d1773874f3ca1cef..5212358306a684c006e8ca30c3f7e21fb3c97afb 100644 (file)
--- a/Documentation/git-stripspace.txt
+++ b/Documentation/git-stripspace.txt
@@ -8,7 +8,7 @@ git-stripspace - Filter out empty lines
 
 SYNOPSIS
 --------
-'git-stripspace' < <stream>
+'git-stripspace' [-s | --strip-comments] < <stream>
 
 DESCRIPTION
 -----------
@@ -16,6 +16,9 @@ Remove multiple empty lines, and empty lines at beginning and end.
 
 OPTIONS
 -------
+-s\|--strip-comments::
+       In addition to empty lines, also strip lines starting with '#'.
+
 <stream>::
        Byte stream to act on.
 
@@ -30,4 +33,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 GIT
 ---
 Part of the gitlink:git[7] suite
-