Skip to content

Conversation

jnavila
Copy link

@jnavila jnavila commented May 24, 2025

This is the follow-up in the conversion of the manpages to the synopsis style.

This time, we address git checkout, git switch, git merge and git mergetool.

I added a small grammatical fixup in merge options.

jnavila added 9 commits May 24, 2025 07:58
- 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 <[email protected]>
- 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 <[email protected]>
- 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 <[email protected]>
- 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 <[email protected]>
- 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 <[email protected]>
- 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 <[email protected]>
- 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 <[email protected]>
- 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 <[email protected]>
@jnavila jnavila changed the title Checkout merge doc: convert checkout, switch and merge to new format May 25, 2025
@jnavila
Copy link
Author

jnavila commented May 25, 2025

/submit

Copy link

gitgitgadget bot commented May 25, 2025

Submitted as [email protected]

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-1927/jnavila/checkout_merge-v1

To fetch this version to local tag pr-1927/jnavila/checkout_merge-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-1927/jnavila/checkout_merge-v1

Copy link

gitgitgadget bot commented May 27, 2025

This patch series was integrated into seen via git@c9fa9a4.

@gitgitgadget gitgitgadget bot added the seen label May 27, 2025
Copy link

gitgitgadget bot commented May 28, 2025

This branch is now known as ja/doc-synopsis-style.

Copy link

gitgitgadget bot commented May 28, 2025

This patch series was integrated into seen via git@b29a910.

Copy link

gitgitgadget bot commented May 29, 2025

This patch series was integrated into seen via git@c25ea67.

Copy link

gitgitgadget bot commented May 30, 2025

This patch series was integrated into seen via git@e870d2b.

Copy link

gitgitgadget bot commented May 31, 2025

There was a status update in the "Cooking" section about the branch ja/doc-synopsis-style on the Git mailing list:

Doc mark-up fixes.

Will merge to 'next'?
source: <[email protected]>

Copy link

gitgitgadget bot commented Jun 2, 2025

This patch series was integrated into seen via git@dc287db.

Copy link

gitgitgadget bot commented Jun 2, 2025

This patch series was integrated into next via git@8f6b14e.

@gitgitgadget gitgitgadget bot added the next label Jun 2, 2025
Copy link

gitgitgadget bot commented Jun 2, 2025

This patch series was integrated into seen via git@4f91e60.

Copy link

gitgitgadget bot commented Jun 2, 2025

This patch series was integrated into master via git@4f91e60.

Copy link

gitgitgadget bot commented Jun 2, 2025

This patch series was integrated into next via git@4f91e60.

@gitgitgadget gitgitgadget bot added the master label Jun 2, 2025
Copy link

gitgitgadget bot commented Jun 2, 2025

Closed via 4f91e60.

@gitgitgadget gitgitgadget bot closed this Jun 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant