Merge branch 'maint-1.7.0' into maint

diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt
index 1306d7bab70efb57cba62a98ebd2d67b06677c97..7508c0e42d2cd50ac522fc80a3a866411b7b51c5 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,10 @@ 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.
 
@@ -29,4 +33,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite