Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: git-notes.txt: migrate to new documentation format #1846

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

jnavila
Copy link

@jnavila jnavila commented Jan 3, 2025

cc: Patrick Steinhardt [email protected]

The git-notes manpage files were converted to the new documentation
format:

- switching 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
Copy link
Author

jnavila commented Jan 3, 2025

/submit

Copy link

gitgitgadget bot commented Jan 3, 2025

Submitted as [email protected]

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-1846/jnavila/git-notes-new-format-v1

To fetch this version to local tag pr-1846/jnavila/git-notes-new-format-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-1846/jnavila/git-notes-new-format-v1

Copy link

gitgitgadget bot commented Jan 3, 2025

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

@gitgitgadget gitgitgadget bot added the seen label Jan 3, 2025
Copy link

gitgitgadget bot commented Jan 6, 2025

On the Git mailing list, Patrick Steinhardt wrote (reply to this):

On Fri, Jan 03, 2025 at 05:10:16PM +0000, Jean-Noël Avila via GitGitGadget wrote:
> From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <[email protected]>
> 
> The git-notes manpage files were converted to the new documentation
> format:
> 
> - switching 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.

I think it might be a bit easier to send related changes like this and
your changes to git-restore(1) in a single patch series going forward.
It allows the reviewer to bundle related reviews together, which
requires less context switching. It also allows them to more easily
refer to similar review feedbacks sent for preceding patches.

Other than that I've got the same comments here regarding the style of
the commit message as with your git-restore(1) patch. Ah, I also noticed
that the subject should probably be amended because we don't typically
specify multiple subsystems with colons. For example:

    Documentation: migrate git-restore(1) to new style format

> diff --git a/Documentation/config/notes.txt b/Documentation/config/notes.txt
> index 43db8e808d7..70859f5c574 100644
> --- a/Documentation/config/notes.txt
> +++ b/Documentation/config/notes.txt
> @@ -26,27 +26,27 @@ globs.
>  A warning will be issued for refs that do not exist,
>  but a glob that does not match any refs is silently ignored.
>  +
> -This setting can be disabled by the `--no-notes` option to the 'git
> -log' family of commands, or by the `--notes=<ref>` option accepted by
> +This setting can be disabled by the `--no-notes` option to the `git
> +log` family of commands, or by the `--notes=<ref>` option accepted by
>  those commands.

Should this rather use "to the linkgit:git-log[1] family of commands,
..."?

> diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
> index 84022f99d76..02a3495986a 100644
> --- a/Documentation/git-notes.txt
> +++ b/Documentation/git-notes.txt
> @@ -33,34 +33,34 @@ ENVIRONMENT sections below.  If this ref does not exist, it will be
>  quietly created when it is first needed to store a note.
>  
>  A typical use of notes is to supplement a commit message without
> -changing the commit itself. Notes can be shown by 'git log' along with
> +changing the commit itself. Notes can be shown by `git log` along with
>  the original commit message. To distinguish these notes from the
>  message stored in the commit object, the notes are indented like the
> -message, after an unindented line saying "Notes (<refname>):" (or
> -"Notes:" for `refs/notes/commits`).
> +message, after an unindented line saying "`Notes (<refname>):`" (or
> +"`Notes:`" for `refs/notes/commits`).

Curious. I'm not familiar with the modern best practices around where to
apply what kind of quoting, so why is it "`foo`" here and not `"foo"` or
`foo:`?

Thanks!

Patrick

Copy link

gitgitgadget bot commented Jan 6, 2025

User Patrick Steinhardt <[email protected]> has been added to the cc: list.

Copy link

gitgitgadget bot commented Jan 6, 2025

On the Git mailing list, Junio C Hamano wrote (reply to this):

Patrick Steinhardt <[email protected]> writes:

> I think it might be a bit easier to send related changes like this and
> your changes to git-restore(1) in a single patch series going forward.
> It allows the reviewer to bundle related reviews together, which
> requires less context switching. It also allows them to more easily
> refer to similar review feedbacks sent for preceding patches.

Thanks.  I had exactly the same reaction to these patches, and I,
after reading all your responses to them, agree with you.

Copy link

gitgitgadget bot commented Jan 6, 2025

This branch is now known as ja/doc-notes-markup-updates.

Copy link

gitgitgadget bot commented Jan 6, 2025

This patch series was integrated into seen via git@068cb6a.

Copy link

gitgitgadget bot commented Jan 6, 2025

There was a status update in the "New Topics" section about the branch ja/doc-notes-markup-updates on the Git mailing list:

Doc mark-up updates.

source: <[email protected]>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant