summaryrefslogtreecommitdiff
path: root/Documentation/git-stripspace.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-04 10:23:49 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-04 10:23:49 -0800
commit149a4211a4b8d8bbcdd72685d538d6ac7365e29e (patch)
treef0e37272889876737f0216021ea8d23785763fa2 /Documentation/git-stripspace.txt
parentbcd45b4085f9269a536c8fb1963ac8380bfac0e8 (diff)
parenteff80a9fd990de3605063050dae32f969ef18ba8 (diff)
downloadgit-149a4211a4b8d8bbcdd72685d538d6ac7365e29e.tar.gz
Merge branch 'jc/custom-comment-char'
Allow a configuration variable core.commentchar to customize the character used to comment out the hint lines in the edited text from the default '#'. * jc/custom-comment-char: Allow custom "comment char"
Diffstat (limited to 'Documentation/git-stripspace.txt')
-rw-r--r--Documentation/git-stripspace.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt
index a80d94650d..e6fdfcb994 100644
--- 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
--------