summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jonas Fonseca <fonseca@diku.dk>2007-11-02 10:10:11 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-11-02 15:38:24 -0700
commit7b55eee77e11da162fb197a79b72af375ed0f1d0 (patch)
tree2f3780b639576b79467f66a6184a47681a0ba21a
parentgit-format-patch.txt: fix explanation of an example. (diff)
downloadtgif-7b55eee77e11da162fb197a79b72af375ed0f1d0.tar.xz
Remove escaping of '|' in manpage option sections
The escaped were ending up verbatim in the generated documentation. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-filter-branch.txt2
-rw-r--r--Documentation/git-stripspace.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 385ecc900f..895d750310 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -152,7 +152,7 @@ definition impossible to preserve signatures at any rate.)
does this in the '.git-rewrite/' directory but you can override
that choice by this parameter.
--f\|--force::
+-f|--force::
`git filter-branch` refuses to start with an existing temporary
directory or when there are already refs starting with
'refs/original/', unless forced.
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>::