Merge branch 'dk/maint-blame-el'

diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt
index fc87146d594a832051865883f6a47e60ed58585d..7508c0e42d2cd50ac522fc80a3a866411b7b51c5 100644 (file)
--- a/Documentation/git-stripspace.txt
+++ b/Documentation/git-stripspace.txt
@@ -3,26 +3,25 @@ git-stripspace(1)
 
 NAME
 ----
-git-stripspace - Some git command not yet documented.
+git-stripspace - Filter out empty lines
 
 
 SYNOPSIS
 --------
-'git-stripspace' [ --option ] <args>...
+'git stripspace' [-s | --strip-comments] < <stream>
 
 DESCRIPTION
 -----------
-Does something not yet documented.
-
+Remove multiple empty lines, and empty lines at beginning and end.
 
 OPTIONS
 -------
---option::
-       Some option not yet documented.
-
-<args>...::
-       Some argument not yet documented.
+-s::
+--strip-comments::
+       In addition to empty lines, also strip lines starting with '#'.
 
+<stream>::
+       Byte stream to act on.
 
 Author
 ------
@@ -34,5 +33,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the link:git.html[git] suite
-
+Part of the linkgit:git[1] suite