]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 13d5331) | patch
doc: convert merge options to new synopsis format
authorJean-Noël Avila <jn.avila@free.fr>
Sun, 25 May 2025 20:27:03 +0000 (20:27 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 May 2025 14:50:59 +0000 (07:50 -0700)
commit5f3213232fa052e62b6ec33447aa50936ef1e232
treecbb123cc31ea18c8be9deacf7de4d63bbfd1d5eftree | snapshot
parent13d5331cccf8c23f1d4eb9b6a24e2308c8631d00commit | diff
doc: convert merge options 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.

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