diff options
author | Andrei Rybak <rybak.a.v@gmail.com> | 2023-01-23 10:01:14 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-01-23 09:40:14 -0800 |
commit | 70661d288b696578f18b56cea1beaa51497da88d (patch) | |
tree | 86811cee988afe65a4758dd1ed6eb80175685aa3 /Documentation/git-apply.txt | |
parent | 844ede312b4e988881b6e27e352f469d8ab80b2a (diff) | |
download | git-70661d288b696578f18b56cea1beaa51497da88d.tar.gz |
Documentation: render dash correctly
Three hyphens are rendered verbatim in documentation, so "--" has to be
used to produce a dash. Fix asciidoc output for dashes. This is
similar to previous commits f0b922473e (Documentation: render special
characters correctly, 2021-07-29) and de82095a95 (doc
hash-function-transition: fix asciidoc output, 2021-02-05).
Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-apply.txt')
-rw-r--r-- | Documentation/git-apply.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 1d478cbe9b..5e16e6db7e 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -208,7 +208,7 @@ behavior: * `warn` outputs warnings for a few such errors, but applies the patch as-is (default). * `fix` outputs warnings for a few such errors, and applies the - patch after fixing them (`strip` is a synonym --- the tool + patch after fixing them (`strip` is a synonym -- the tool used to consider only trailing whitespace characters as errors, and the fix involved 'stripping' them, but modern Gits do more). * `error` outputs warnings for a few such errors, and refuses |