diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-01-30 22:24:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-30 22:24:24 (GMT) |
| commit | a5eaa76b30db6ebec5141e6f6cab78db3402e85b (patch) | |
| tree | cc4bc6b059756d49d5fd7ad87a3832803fc17d8f /Documentation/git.txt | |
| parent | 777afaaa5c9cefc640e3a32346ebc79e0c73f9a6 (diff) | |
| parent | 70661d288b696578f18b56cea1beaa51497da88d (diff) | |
| download | git-a5eaa76b30db6ebec5141e6f6cab78db3402e85b.zip git-a5eaa76b30db6ebec5141e6f6cab78db3402e85b.tar.gz git-a5eaa76b30db6ebec5141e6f6cab78db3402e85b.tar.bz2 | |
Merge branch 'ar/markup-em-dash'
Doc mark-up updates.
* ar/markup-em-dash:
Documentation: render dash correctly
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 f9a7a45..74973d3 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -613,7 +613,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>. |