From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Jun 2025 16:25:33 +0000 (-0700)
Subject: Merge branch 'ja/doc-synopsis-style'
X-Git-Tag: v2.50.0-rc1~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f91e606fb86633cdaf6dca40deeb517efe5b91a;p=thirdparty%2Fgit.git

Merge branch 'ja/doc-synopsis-style'

Doc mark-up fixes.

* ja/doc-synopsis-style:
  doc: convert git-switch manpage to new synopsis style
  doc: convert git-mergetool options to new synopsis style
  doc: convert git-mergetool manpage to new synopsis style
  doc: switch merge config description to new synopsis format
  doc: convert merge strategies to synopsis format
  doc: merge-options.adoc remove a misleading double negation
  doc: convert merge options to new synopsis format
  doc: convert git-merge manpage to new style
  doc: convert git-checkout manpage to new style
---

4f91e606fb86633cdaf6dca40deeb517efe5b91a