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 18:40:14 +0100 |
| commit | 70661d288b696578f18b56cea1beaa51497da88d (patch) | |
| tree | 86811cee988afe65a4758dd1ed6eb80175685aa3 /Documentation/git.txt | |
| parent | Sync with maint-2.38 (diff) | |
| download | git-70661d288b696578f18b56cea1beaa51497da88d.tar.xz git-70661d288b696578f18b56cea1beaa51497da88d.zip | |
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.txt')
| -rw-r--r-- | Documentation/git.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 1d33e083ab..df359fbf47 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -619,7 +619,7 @@ The file parameters can point at the user's working file (e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the -temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits. +temporary file -- it is removed when `GIT_EXTERNAL_DIFF` exits. + For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>. |