]> git.99rst.org Git - git.git/commit
git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cbbb3b2)
doc: convert merge strategies to synopsis format
authorJean-Noël Avila <redacted>
Sun, 25 May 2025 20:27:05 +0000 (20:27 +0000)
committerJunio C Hamano <redacted>
Tue, 27 May 2025 14:51:00 +0000 (07:51 -0700)
commit179f877b88ce2a4f1c540f825741402e9c92915e
treeee2c15ad6daeb04e62a758e6f8c662f2bd739d19tree
parentcbbb3b2d3897ea68f0d7ae441aec737e49586526commit | diff
doc: convert merge strategies to synopsis format

- Switch the synopsis to a synopsis block which will automatically
  format placeholders in italics and keywords in monospace
- 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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/merge-strategies.adoc diff | blob | history
git clone https://git.99rst.org/PROJECT