Merge branch 'jc/maint-add-u-remove-conflicted'

diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt
index fc5687502e519f55b3be0dec5d89778e8b8d4d13..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' [-s | --strip-comments] < <stream>
+'git stripspace' [-s | --strip-comments] < <stream>
 
 DESCRIPTION
 -----------
@@ -16,7 +16,8 @@ Remove multiple empty lines, and empty lines at beginning and end.
 
 OPTIONS
 -------
--s|--strip-comments::
+-s::
+--strip-comments::
        In addition to empty lines, also strip lines starting with '#'.
 
 <stream>::
@@ -32,4 +33,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite