summaryrefslogtreecommitdiff
path: root/Documentation/git-stripspace.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-02 16:56:42 -0700
committerJunio C Hamano <gitster@pobox.com>2007-11-02 16:56:42 -0700
commite3d6d56f1c2097f13a427e158638e5e0918e5705 (patch)
tree0477acbfdb7994663be7f22a5ae836e384a2dc6f /Documentation/git-stripspace.txt
parent3d66dc9657f195cb241387a87bcdd5709abd8a21 (diff)
parentf45e867b1a60a2023c18719888bb52965ade7192 (diff)
downloadgit-e3d6d56f1c2097f13a427e158638e5e0918e5705.tar.gz
Merge branch 'maint'
* maint: Fixing path quoting in git-rebase Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites. Documentation: quote commit messages consistently. Remove escaping of '|' in manpage option sections
Diffstat (limited to 'Documentation/git-stripspace.txt')
-rw-r--r--Documentation/git-stripspace.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt
index 5212358306..f80526ba7e 100644
--- a/Documentation/git-stripspace.txt
+++ b/Documentation/git-stripspace.txt
@@ -16,7 +16,7 @@ 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>::