]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 179f877) | patch
doc: switch merge config description to new synopsis format
authorJean-Noël Avila <jn.avila@free.fr>
Sun, 25 May 2025 20:27:06 +0000 (20:27 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 May 2025 14:51:00 +0000 (07:51 -0700)
commit90a837a72087595cc111e181b754f56561de87aa
tree19138bf1ef4f859e94db535c94f90c399ed007b9tree
parent179f877b88ce2a4f1c540f825741402e9c92915ecommit | diff
doc: switch merge config description to new synopsis format

- 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.

Additionally, a list of option possible values has been reformatted as a
standalone definition list.

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