diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2025-05-25 20:27:02 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-05-27 07:50:59 -0700 |
| commit | 13d5331cccf8c23f1d4eb9b6a24e2308c8631d00 (patch) | |
| tree | 578db0e6aa5101e79ef3ac4cea442e59bede4e9c /commit.h | |
| parent | 3d26ec171567ef205648380fb621ab0369f910e1 (diff) | |
doc: convert git-merge manpage to new style
- 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.
In order to avoid breaking the format on '<<<<<<' and '>>>>>' lines
by applying the synopsis rules to these spans, they are formatted using '+'
signs instead of '`' signs.
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions