Merge branch 'maint'

diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt
index a80d94650d3a6b724dc68aac18fd562ff38d2cf8..e6fdfcb9941c69320a032a2ea196d68caddbf2dc 100644 (file)
--- a/Documentation/git-stripspace.txt
+++ b/Documentation/git-stripspace.txt
@@ -35,7 +35,13 @@ OPTIONS
 -------
 -s::
 --strip-comments::
-       Skip and remove all lines starting with '#'.
+       Skip and remove all lines starting with comment character (default '#').
+
+-c::
+--comment-lines::
+       Prepend comment character and blank to each line. Lines will automatically
+       be terminated with a newline. On empty lines, only the comment character
+       will be prepended.
 
 EXAMPLES
 --------