]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1654396) | patch
doc: convert git-mergetool options to new synopsis style
authorJean-Noël Avila <jn.avila@free.fr>
Sun, 25 May 2025 20:27:08 +0000 (20:27 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 May 2025 14:51:01 +0000 (07:51 -0700)
commitd30c5cc45921fcb8e185ec7a0b69d9b474a669a3
tree1e52922627e6f5c7fa74448df2c1fcf6ff61d3a1tree | snapshot
parent16543967822710cafc7574d4be6fed348f236ff0commit | diff
doc: convert git-mergetool options to new synopsis style

- Use _<placeholder>_ instead of <placeholder> in the description
- Use `backticks` for keywords and more complex option
descriptions. The new rendering engine will apply synopsis rules to
these spans.

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config/mergetool.adoc diff | blob | blame | history
Documentation/mergetools/vimdiff.adoc diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.