From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80E6746B5
	for <git@vger.kernel.org>; Fri,  3 Jan 2025 17:10:20 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1735924223; cv=none; b=Rf1X6xyci1cHeSEcymjrUcttunY4KO1aVaJLgH4JqIMztHMS9L4aHzN0cqfjS7OIiivOcjdYFOtrvE1MTfV8diznoekSI0bAohdAKVjfdUNvsCt4yJQegFoGxUSP5vxvpvlK/bUoDDaaLZoB1qFYeovISs3JqSWGP4ikmd0fcbU=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1735924223; c=relaxed/simple;
	bh=MKVsbVMnWmReqDG1Oo+r45y8wI25/Qstpt2VhnpWmEw=;
	h=Message-Id:From:Date:Subject:MIME-Version:Content-Type:To:Cc; b=ek38ugC1f0OthJ7zG9vJ9v1uc2Fsyd+Cn91oWRuQQav5vzIjIDcQO1OgtAebdzAOIPTTpmdKv1T9KPDMpQx2pbL4qAcGeoY0QMZ0utx2AH+j9+U6PHhVfzmKCmGQve53HkEa/ZL/Bh69c93UXALcKlOKyYnt/lUVFycbBWf25Cw=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EgL0uWBO; arc=none smtp.client-ip=209.85.128.45
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EgL0uWBO"
Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-436341f575fso129193625e9.1
        for <git@vger.kernel.org>; Fri, 03 Jan 2025 09:10:20 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20230601; t=1735924218; x=1736529018; darn=vger.kernel.org;
        h=cc:to:fcc:content-transfer-encoding:mime-version:subject:date:from
         :message-id:from:to:cc:subject:date:message-id:reply-to;
        bh=KFV5WbM+eNZi3Rh4H8Pwi8xlwr9GtfJMdjBAWU/dg7c=;
        b=EgL0uWBO2I98NUiSDklI1JiXYxbWx9a77QeUy8Wt9IIJkmbZaQ2pqJ8ChOx66X6k4Q
         OGZU9gt+szRBBiLdvRl+jadVSmf0b2kF6dP+R3e7yT1my44gjdqZVORat2Bv/TafpGkZ
         GzN8ZX8VFFjcQGc0+UwXBF4RvN4Bnp63VPlz6Kaf42oRBmhOknQ0Su/OZSvI0QARzmTV
         dJs1ocnM5DFxLzm4EI8KREdBucsWZ3OlXez2SkO7TuCl7aNlogs6j/c+jQVCTEd7ui9r
         IwNX8wjHTooIo3DR7OYeNkO6jjBr9tetiLnpaSjk+FEa/2swWj731kiyP/LhO86rjHNz
         FDYg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1735924218; x=1736529018;
        h=cc:to:fcc:content-transfer-encoding:mime-version:subject:date:from
         :message-id:x-gm-message-state:from:to:cc:subject:date:message-id
         :reply-to;
        bh=KFV5WbM+eNZi3Rh4H8Pwi8xlwr9GtfJMdjBAWU/dg7c=;
        b=M2a5YdKj/+c0dN5xyrM3b7FgOvZLlVD7n/qfXpIQ4cvONjc9cLAboR9yOvvv9AwROF
         rAPuOTr/IgiqKsS3KQEw+drC91zZZiD384JS8dm5bvL5/XVjwxxJZtjTPxqpJTm5aoRJ
         /XzU541Bo3vXqJEwBKsIJDZ7kNhVKkvdhoc/lamnHCJGyIZTsAZK1DAqo6RDoMN00tpb
         1XYc4V1CjJI2ixnq3ntTPbrWwkwYCf4ulKm4H9MDYuzzQivYTGZzUu60fdWSfRhrPY9Y
         qxyogrbk6PZohn0FZW7KO5Th8SL+FjoLsB0nFCmSp7iq6X+cYG5J+2pQvUtZ4b9chun5
         hT3g==
X-Gm-Message-State: AOJu0YzQ19hLq6zrJLP70HwOrHE1XZ/1U9bakpvaM++hiuUSqkjuMr5R
	p+irWANyvvBtixGfkuYjMt6URcY7UIKsfOGTsuCDRamdQR0VXbqQIi/Owg==
X-Gm-Gg: ASbGncuZ31UDdjTN/0pq2Gn1SAXQ9NE6v8J5Lt9JcS0XtPHNqzoSMu+mr90bjs1utfZ
	HiTktag+igWYX2G6iVLorhj2mxIBCyUgBcQij28NKuvMmUKSkBaXeLYTIkC9O3kGmV2VkXhk3iQ
	J4UqeognOIlTbYMY2kIxpcjpWl8K8cc/S2aJsMmfSWDz4qyZ5+N3wLRpBPncONzRHE76Psp/Vq/
	EQCyCFLMVtkUy51cbVmISmxZn2Lp4RdMOlvjDNU2o0IjwIzxTSbskWpjQ==
X-Google-Smtp-Source: AGHT+IFgSsbIpIlU2NJ3caQDeu20EZ9VXMMzvdbv7y6rutci151ZmN+VXa6veiHcnB5xo50/+DI9lg==
X-Received: by 2002:a05:600c:35c9:b0:434:f753:6012 with SMTP id 5b1f17b1804b1-436686440bemr464032625e9.17.1735924218047;
        Fri, 03 Jan 2025 09:10:18 -0800 (PST)
Received: from [127.0.0.1] ([13.74.141.28])
        by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43661219a08sm493721775e9.25.2025.01.03.09.10.17
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Fri, 03 Jan 2025 09:10:17 -0800 (PST)
Message-Id: <pull.1846.git.1735924216993.gitgitgadget@gmail.com>
From: "=?UTF-8?Q?Jean-No=C3=ABl?= Avila via GitGitGadget" <gitgitgadget@gmail.com>
Date: Fri, 03 Jan 2025 17:10:16 +0000
Subject: [PATCH] doc: git-notes.txt: migrate to new documentation format
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
List-Id: <git.vger.kernel.org>
List-Subscribe: <mailto:git+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:git+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fcc: Sent
To: git@vger.kernel.org
Cc: =?UTF-8?Q?Jean-No=C3=ABl?= Avila <jn.avila@free.fr>,
    =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>

From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>

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 <jn.avila@free.fr>
---
    doc: git-notes.txt: migrate to new documentation format

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1846%2Fjnavila%2Fgit-notes-new-format-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1846/jnavila/git-notes-new-format-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1846

 Documentation/config/notes.txt |  32 +++---
 Documentation/git-notes.txt    | 193 +++++++++++++++++----------------
 2 files changed, 113 insertions(+), 112 deletions(-)

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
@@ -1,4 +1,4 @@
-notes.mergeStrategy::
+`notes.mergeStrategy`::
 	Which merge strategy to choose by default when resolving notes
 	conflicts.  Must be one of `manual`, `ours`, `theirs`, `union`, or
 	`cat_sort_uniq`.  Defaults to `manual`.  See the "NOTES MERGE STRATEGIES"
@@ -7,17 +7,17 @@ notes.mergeStrategy::
 This setting can be overridden by passing the `--strategy` option to
 linkgit:git-notes[1].
 
-notes.<name>.mergeStrategy::
+`notes.<name>.mergeStrategy`::
 	Which merge strategy to choose when doing a notes merge into
-	refs/notes/<name>.  This overrides the more general
-	"notes.mergeStrategy".  See the "NOTES MERGE STRATEGIES" section in
+	`refs/notes/<name>`.  This overrides the more general
+	`notes.mergeStrategy`.  See the "NOTES MERGE STRATEGIES" section in
 	linkgit:git-notes[1] for more information on the available strategies.
 
-notes.displayRef::
+`notes.displayRef`::
 	Which ref (or refs, if a glob or specified more than once), in
 	addition to the default set by `core.notesRef` or
 	`GIT_NOTES_REF`, to read notes from when showing commit
-	messages with the 'git log' family of commands.
+	messages with the `git log` family of commands.
 +
 This setting can be overridden with the `GIT_NOTES_DISPLAY_REF`
 environment variable, which must be a colon separated list of refs or
@@ -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.
 +
-The effective value of "core.notesRef" (possibly overridden by
-GIT_NOTES_REF) is also implicitly added to the list of refs to be
+The effective value of `core.notesRef` (possibly overridden by
+`GIT_NOTES_REF`) is also implicitly added to the list of refs to be
 displayed.
 
-notes.rewrite.<command>::
-	When rewriting commits with <command> (currently `amend` or
+`notes.rewrite.<command>`::
+	When rewriting commits with _<command>_ (currently `amend` or
 	`rebase`), if this variable is `false`, git will not copy
 	notes from the original to the rewritten commit.  Defaults to
-	`true`.  See also "`notes.rewriteRef`" below.
+	`true`.  See also `notes.rewriteRef` below.
 +
 This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
 environment variable, which must be a colon separated list of refs or
 globs.
 
-notes.rewriteMode::
+`notes.rewriteMode`::
 	When copying notes during a rewrite (see the
-	"notes.rewrite.<command>" option), determines what to do if
+	`notes.rewrite.<command>` option), determines what to do if
 	the target commit already has a note.  Must be one of
 	`overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`.
 	Defaults to `concatenate`.
@@ -54,7 +54,7 @@ notes.rewriteMode::
 This setting can be overridden with the `GIT_NOTES_REWRITE_MODE`
 environment variable.
 
-notes.rewriteRef::
+`notes.rewriteRef`::
 	When copying notes during a rewrite, specifies the (fully
 	qualified) ref whose notes should be copied.  May be a glob,
 	in which case notes in all matching refs will be copied.  You
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
@@ -7,19 +7,19 @@ git-notes - Add or inspect object notes
 
 SYNOPSIS
 --------
-[verse]
-'git notes' [list [<object>]]
-'git notes' add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]
-'git notes' copy [-f] ( --stdin | <from-object> [<to-object>] )
-'git notes' append [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]
-'git notes' edit [--allow-empty] [<object>] [--[no-]stripspace]
-'git notes' show [<object>]
-'git notes' merge [-v | -q] [-s <strategy> ] <notes-ref>
-'git notes' merge --commit [-v | -q]
-'git notes' merge --abort [-v | -q]
-'git notes' remove [--ignore-missing] [--stdin] [<object>...]
-'git notes' prune [-n] [-v]
-'git notes' get-ref
+[synopsis]
+git notes [list [<object>]]
+git notes add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]
+git notes copy [-f] ( --stdin | <from-object> [<to-object>] )
+git notes append [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]
+git notes edit [--allow-empty] [<object>] [--[no-]stripspace]
+git notes show [<object>]
+git notes merge [-v | -q] [-s <strategy> ] <notes-ref>
+git notes merge --commit [-v | -q]
+git notes merge --abort [-v | -q]
+git notes remove [--ignore-missing] [--stdin] [<object>...]
+git notes prune [-n] [-v]
+git notes get-ref
 
 
 DESCRIPTION
@@ -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`).
 
 Notes can also be added to patches prepared with `git format-patch` by
 using the `--notes` option. Such notes are added as a patch commentary
 after a three dash separator line.
 
-To change which notes are shown by 'git log', see the
-"notes.displayRef" discussion in <<CONFIGURATION>>.
+To change which notes are shown by `git log`, see the
+`notes.displayRef` discussion in <<CONFIGURATION,CONFIGURATION>>.
 
-See the "notes.rewrite.<command>" configuration for a way to carry
+See the `notes.rewrite.<command>` configuration for a way to carry
 notes across commands that rewrite commits.
 
 
 SUBCOMMANDS
 -----------
 
-list::
+`list`::
 	List the notes object for a given object. If no object is
 	given, show a list of all note objects and the objects they
-	annotate (in the format "<note-object> <annotated-object>").
+	annotate (in the format "`<note-object> <annotated-object>`").
 	This is the default subcommand if no subcommand is given.
 
-add::
-	Add notes for a given object (defaults to HEAD). Abort if the
+`add`::
+	Add notes for a given object (defaults to `HEAD`). Abort if the
 	object already has notes (use `-f` to overwrite existing notes).
 	However, if you're using `add` interactively (using an editor
 	to supply the notes contents), then - instead of aborting -
@@ -71,10 +71,10 @@ add::
 	fine-tune the message(s) supplied from `-m` and `-F` options
 	interactively (using an editor) before adding the note.
 
-copy::
+`copy`::
 	Copy the notes for the first object onto the second object (defaults to
-	HEAD). Abort if the second object already has notes, or if the first
-	object has none (use -f to overwrite existing notes to the
+	`HEAD`). Abort if the second object already has notes, or if the first
+	object has none (use `-f` to overwrite existing notes to the
 	second object). This subcommand is equivalent to:
 	`git notes add [-f] -C $(git notes list <from-object>) <to-object>`
 +
@@ -84,27 +84,27 @@ In `--stdin` mode, take lines in the format
 <from-object> SP <to-object> [ SP <rest> ] LF
 ----------
 +
-on standard input, and copy the notes from each <from-object> to its
-corresponding <to-object>.  (The optional `<rest>` is ignored so that
+on standard input, and copy the notes from each _<from-object>_ to its
+corresponding _<to-object>_.  (The optional _<rest>_ is ignored so that
 the command can read the input given to the `post-rewrite` hook.)
 
-append::
+`append`::
 	Append new message(s) given by `-m` or `-F` options to an
 	existing note, or add them as a new note if one does not
-	exist, for the object (defaults to HEAD).  When appending to
+	exist, for the object (defaults to `HEAD`).  When appending to
 	an existing note, a blank line is added before each new
 	message as an inter-paragraph separator.  The separator can
 	be customized with the `--separator` option.
 	Edit the notes to be appended given by `-m` and `-F` options with
 	`-e` interactively (using an editor) before appending the note.
 
-edit::
-	Edit the notes for a given object (defaults to HEAD).
+`edit`::
+	Edit the notes for a given object (defaults to `HEAD`).
 
-show::
-	Show the notes for a given object (defaults to HEAD).
+`show`::
+	Show the notes for a given object (defaults to `HEAD`).
 
-merge::
+`merge`::
 	Merge the given notes ref into the current notes ref.
 	This will try to merge the changes made by the given
 	notes ref (called "remote") since the merge-base (if
@@ -112,35 +112,35 @@ merge::
 +
 If conflicts arise and a strategy for automatically resolving
 conflicting notes (see the "NOTES MERGE STRATEGIES" section) is not given,
-the "manual" resolver is used. This resolver checks out the
+the `manual` resolver is used. This resolver checks out the
 conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`),
 and instructs the user to manually resolve the conflicts there.
 When done, the user can either finalize the merge with
-'git notes merge --commit', or abort the merge with
-'git notes merge --abort'.
+`git notes merge --commit`, or abort the merge with
+`git notes merge --abort`.
 
-remove::
-	Remove the notes for given objects (defaults to HEAD). When
+`remove`::
+	Remove the notes for given objects (defaults to `HEAD`). When
 	giving zero or one object from the command line, this is
 	equivalent to specifying an empty note message to
 	the `edit` subcommand.
 
-prune::
+`prune`::
 	Remove all notes for non-existing/unreachable objects.
 
-get-ref::
+`get-ref`::
 	Print the current notes ref. This provides an easy way to
 	retrieve the current notes ref (e.g. from scripts).
 
 OPTIONS
 -------
--f::
---force::
+`-f`::
+`--force`::
 	When adding notes to an object that already has notes,
 	overwrite the existing notes (instead of aborting).
 
--m <msg>::
---message=<msg>::
+`-m <msg>`::
+`--message=<msg>`::
 	Use the given note message (instead of prompting).
 	If multiple `-m` options are given, their values
 	are concatenated as separate paragraphs.
@@ -148,95 +148,96 @@ OPTIONS
 	single line between paragraphs will be stripped out.
 	If you wish to keep them verbatim, use `--no-stripspace`.
 
--F <file>::
---file=<file>::
-	Take the note message from the given file.  Use '-' to
+`-F <file>`::
+`--file=<file>`::
+	Take the note message from the given file.  Use `-` to
 	read the note message from the standard input.
 	Lines starting with `#` and empty lines other than a
 	single line between paragraphs will be stripped out.
 	If you wish to keep them verbatim, use `--no-stripspace`.
 
--C <object>::
---reuse-message=<object>::
+`-C <object>`::
+`--reuse-message=<object>`::
 	Take the given blob object (for example, another note) as the
 	note message. (Use `git notes copy <object>` instead to
 	copy notes between objects.).  By default, message will be
 	copied verbatim, but if you wish to strip out the lines
 	starting with `#` and empty lines other than a single line
-	between paragraphs, use with`--stripspace` option.
+	between paragraphs, use with `--stripspace` option.
 
--c <object>::
---reedit-message=<object>::
-	Like '-C', but with `-c` the editor is invoked, so that
+`-c <object>`::
+`--reedit-message=<object>`::
+	Like `-C`, but with `-c` the editor is invoked, so that
 	the user can further edit the note message.
 
---allow-empty::
+`--allow-empty`::
 	Allow an empty note object to be stored. The default behavior is
 	to automatically remove empty notes.
 
---[no-]separator, --separator=<paragraph-break>::
+`--[no-]separator`::
+`--separator=<paragraph-break>`::
 	Specify a string used as a custom inter-paragraph separator
 	(a newline is added at the end as needed). If `--no-separator`, no
 	separators will be added between paragraphs.  Defaults to a blank
 	line.
 
---[no-]stripspace::
+`--[no-]stripspace`::
 	Strip leading and trailing whitespace from the note message.
 	Also strip out empty lines other than a single line between
 	paragraphs. Lines starting with `#` will be stripped out
 	in non-editor cases like `-m`, `-F` and `-C`, but not in
 	editor case like `git notes edit`, `-c`, etc.
 
---ref <ref>::
-	Manipulate the notes tree in <ref>.  This overrides
-	`GIT_NOTES_REF` and the "core.notesRef" configuration.  The ref
+`--ref <ref>`::
+	Manipulate the notes tree in _<ref>_.  This overrides
+	`GIT_NOTES_REF` and the `core.notesRef` configuration.  The ref
 	specifies the full refname when it begins with `refs/notes/`; when it
 	begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed
 	to form a full name of the ref.
 
---ignore-missing::
+`--ignore-missing`::
 	Do not consider it an error to request removing notes from an
 	object that does not have notes attached to it.
 
---stdin::
+`--stdin`::
 	Also read the object names to remove notes from the standard
 	input (there is no reason you cannot combine this with object
 	names from the command line).
 
--n::
---dry-run::
+`-n`::
+`--dry-run`::
 	Do not remove anything; just report the object names whose notes
 	would be removed.
 
--s <strategy>::
---strategy=<strategy>::
+`-s <strategy>`::
+`--strategy=<strategy>`::
 	When merging notes, resolve notes conflicts using the given
-	strategy. The following strategies are recognized: "manual"
-	(default), "ours", "theirs", "union" and "cat_sort_uniq".
-	This option overrides the "notes.mergeStrategy" configuration setting.
+	strategy. The following strategies are recognized: `manual`
+	(default), `ours`, `theirs`, `union` and `cat_sort_uniq`.
+	This option overrides the `notes.mergeStrategy` configuration setting.
 	See the "NOTES MERGE STRATEGIES" section below for more
 	information on each notes merge strategy.
 
---commit::
-	Finalize an in-progress 'git notes merge'. Use this option
-	when you have resolved the conflicts that 'git notes merge'
-	stored in .git/NOTES_MERGE_WORKTREE. This amends the partial
-	merge commit created by 'git notes merge' (stored in
-	.git/NOTES_MERGE_PARTIAL) by adding the notes in
-	.git/NOTES_MERGE_WORKTREE. The notes ref stored in the
-	.git/NOTES_MERGE_REF symref is updated to the resulting commit.
-
---abort::
-	Abort/reset an in-progress 'git notes merge', i.e. a notes merge
+`--commit`::
+	Finalize an in-progress `git notes merge`. Use this option
+	when you have resolved the conflicts that `git notes merge`
+	stored in `.git/NOTES_MERGE_WORKTREE`. This amends the partial
+	merge commit created by `git notes merge` (stored in
+	`.git/NOTES_MERGE_PARTIAL`) by adding the notes in
+	`.git/NOTES_MERGE_WORKTREE`. The notes ref stored in the
+	`.git/NOTES_MERGE_REF` symref is updated to the resulting commit.
+
+`--abort`::
+	Abort/reset an in-progress `git notes merge`, i.e. a notes merge
 	with conflicts. This simply removes all files related to the
 	notes merge.
 
--q::
---quiet::
+`-q`::
+`--quiet`::
 	When merging notes, operate quietly.
 
--v::
---verbose::
+`-v`::
+`--verbose`::
 	When merging notes, be more verbose.
 	When pruning notes, report all object names whose notes are
 	removed.
@@ -270,28 +271,28 @@ object, in which case the history of the notes can be read with
 NOTES MERGE STRATEGIES
 ----------------------
 
-The default notes merge strategy is "manual", which checks out
+The default notes merge strategy is `manual`, which checks out
 conflicting notes in a special work tree for resolving notes conflicts
 (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the
 conflicts in that work tree.
 When done, the user can either finalize the merge with
-'git notes merge --commit', or abort the merge with
-'git notes merge --abort'.
+`git notes merge --commit`, or abort the merge with
+`git notes merge --abort`.
 
 Users may select an automated merge strategy from among the following using
-either -s/--strategy option or configuring notes.mergeStrategy accordingly:
+either `-s`/`--strategy` option or configuring `notes.mergeStrategy` accordingly:
 
-"ours" automatically resolves conflicting notes in favor of the local
+`ours` automatically resolves conflicting notes in favor of the local
 version (i.e. the current notes ref).
 
-"theirs" automatically resolves notes conflicts in favor of the remote
+`theirs` automatically resolves notes conflicts in favor of the remote
 version (i.e. the given notes ref being merged into the current notes
 ref).
 
-"union" automatically resolves notes conflicts by concatenating the
+`union` automatically resolves notes conflicts by concatenating the
 local and remote versions.
 
-"cat_sort_uniq" is similar to "union", but in addition to concatenating
+`cat_sort_uniq` is similar to `union`, but in addition to concatenating
 the local and remote versions, this strategy also sorts the resulting
 lines, and removes duplicate lines from the result. This is equivalent
 to applying the "cat | sort | uniq" shell pipeline to the local and
@@ -320,7 +321,7 @@ Notes:
 
 In principle, a note is a regular Git blob, and any kind of
 (non-)format is accepted.  You can binary-safely create notes from
-arbitrary files using 'git hash-object':
+arbitrary files using `git hash-object`:
 
 ------------
 $ cc *.c
@@ -331,7 +332,7 @@ $ git notes --ref=built add --allow-empty -C "$blob" HEAD
 (You cannot simply use `git notes --ref=built add -F a.out HEAD`
 because that is not binary-safe.)
 Of course, it doesn't make much sense to display non-text-format notes
-with 'git log', so if you use such notes, you'll probably need to write
+with `git log`, so if you use such notes, you'll probably need to write
 some special-purpose tools to do something useful with them.
 
 
@@ -339,7 +340,7 @@ some special-purpose tools to do something useful with them.
 CONFIGURATION
 -------------
 
-core.notesRef::
+`core.notesRef`::
 	Notes ref to read and manipulate instead of
 	`refs/notes/commits`.  Must be an unabbreviated ref name.
 	This setting can be overridden through the environment and

base-commit: 1b4e9a5f8b5f048972c21fe8acafe0404096f694
-- 
gitgitgadget

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from fout-a3-smtp.messagingengine.com (fout-a3-smtp.messagingengine.com [103.168.172.146])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F6FD20326
	for <git@vger.kernel.org>; Mon,  6 Jan 2025 07:00:07 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.146
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1736146811; cv=none; b=aHbl+aV9EfKkZPYOYXuyNlU7UFqXW+AI2pJQTWiOA0yrTQwnlUPowimhPVXHBN3kXCfp4Tq1CWDGdgUJ8ma0iZADKN40oCGvGybnnTU1eUBouWGM6n/+03Lyq+Q5PB8UDIoJcBCrSit0rS9ZnvpqMKo9LUg/wSGWtltkqupU3eI=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1736146811; c=relaxed/simple;
	bh=9nC9VlNu38lnOt3Bu/3YDP35yY9C+EPtgAGzGYWhOQ0=;
	h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:
	 Content-Type:Content-Disposition:In-Reply-To; b=jS83l/2JRD2A7XKyB0ZPSmmIPgzi6Dtah84L29fTduAS2scrcti8lS8FK1gbrCXDhyhVlk+iPj1uSi3J8SIQs3YPtFqnqImFGgks/nziVNallfWTJVuduNQcno2vLudAq10WUqSsOgCkQL9/3jkhay38dhDjsg5qPRml/xxeIiY=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=jWSo34iA; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=QKje6shn; arc=none smtp.client-ip=103.168.172.146
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="jWSo34iA";
	dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="QKje6shn"
Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46])
	by mailfout.phl.internal (Postfix) with ESMTP id 74B121380169;
	Mon,  6 Jan 2025 02:00:05 -0500 (EST)
Received: from phl-mailfrontend-02 ([10.202.2.163])
  by phl-compute-06.internal (MEProxy); Mon, 06 Jan 2025 02:00:05 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc
	:content-transfer-encoding:content-type:content-type:date:date
	:from:from:in-reply-to:in-reply-to:message-id:mime-version
	:references:reply-to:subject:subject:to:to; s=fm2; t=1736146805;
	 x=1736233205; bh=gVCHPWi9lMN9B/Yu9eIH8mHh3fiNQqrEp7TcLAvy7MA=; b=
	jWSo34iAJ5Q67HqrCOHTxQx4nUo5hdbwCDURC6+X6PKRVrwI8n4JZFwCDd4TahNS
	MU+vMiX/pR0blqyXuKfC2EfIXigPPbMCzQHH7WaAwMPnFcehpKZJYtXe/KcJNvy9
	Q7T+s4PBjF+Z5EJLvM8BadOheiJLf3kxC9jxjfGFJB8kvzSkWhsKWZmS3M+Ola2I
	mq+fhI4K/1YEDNw2DlDqPWwCGeQUMndV9eZ8AftdnLGkJajrOdnaS1NycbrrAeWN
	H8EHLuighJnQXpQcyrjjbw+7AEOiYRWuitIMEkMh7EX5wU7mN5HOu1RNEVby+dD3
	mmMI2fdtYvMPTHkQ710EHg==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
	messagingengine.com; h=cc:cc:content-transfer-encoding
	:content-type:content-type:date:date:feedback-id:feedback-id
	:from:from:in-reply-to:in-reply-to:message-id:mime-version
	:references:reply-to:subject:subject:to:to:x-me-proxy
	:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1736146805; x=
	1736233205; bh=gVCHPWi9lMN9B/Yu9eIH8mHh3fiNQqrEp7TcLAvy7MA=; b=Q
	Kje6shnSTKXpBXjxXkhvrQ0vkI6qC3uFa2BRymfL8abLOi9BeXeSD/Ol/DiRJMF+
	kwm0l90/l7EkJP6Ai8ohS+QOcTiLbrMgpBHYkuZH2Eu9DUOFKJu9WP/6i9rT/xyz
	131sIj0ChXuDOLI2UZ+sDgtIOhhHaMQui+ZFbdpJZAnXjPWkErqy2eBuJMmhkVl+
	0DaESA4fhJNo92WB7dy57eVCwuw7Ss9LVmoZSG+9DvIb3kvFS9S7ThDfGImrBsq9
	BMHgakzeNqR85wdd8LU9RtOWHiO7m0r8qEasWDG0NSWayIf629QapzLjtX+7bC1K
	97XW3wqSiuc2XCs81UNiQ==
X-ME-Sender: <xms:dX97ZwXMzD3Ht7RD-NuN6ZCyj2oC7dYC3m8_ACxb7vKkkScaRFbnzg>
    <xme:dX97Z0l4EQLf0RYEZUREUFFKxnN9LwCzrYln-7lMO6Nj69jda3Kjc-rgV2r129Sqt
    Knl38wDOyE-agIX0g>
X-ME-Received: <xmr:dX97Z0YlLryt3MsyO4tgY5aIEGGII0MtWutAetA4cpeI323aO5-JenCw60QspECjMdufTxvNHEuqu_PQos6X86AXgmJEh1HzfcNbxrwd19HPSA>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudefledguddtvdcutefuodetggdotefrod
    ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp
    uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg
    hnthhsucdlqddutddtmdenucfjughrpeffhffvvefukfhfgggtugfgjgesthekredttddt
    jeenucfhrhhomheprfgrthhrihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrd
    himheqnecuggftrfgrthhtvghrnhepvdefjeeitdetleehieetkeevfedtfedvheekvdev
    teffvdevveejjeelgeetvdfgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe
    hmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnhgspghrtghpthhtohepfedpmhhouggv
    pehsmhhtphhouhhtpdhrtghpthhtohepjhhnrdgrvhhilhgrsehfrhgvvgdrfhhrpdhrtg
    hpthhtohepghhithhgihhtghgrughgvghtsehgmhgrihhlrdgtohhmpdhrtghpthhtohep
    ghhithesvhhgvghrrdhkvghrnhgvlhdrohhrgh
X-ME-Proxy: <xmx:dX97Z_UujuqVQ_WyqNH4fjnttH6gc740lUPkR52Zqd1h7VvJEY1ZaQ>
    <xmx:dX97Z6ng2Zi3XCYVXs7tyBbA0LLH3-oy9eyXO_hxUaIhDoaRK57Z6Q>
    <xmx:dX97Z0caT__lRyJaRJOxWye65mHJrfbAABRvUvc5Cx8yNdC-bvMwig>
    <xmx:dX97Z8GLWwTUeOHQs3cMfsw0-QssBMCJ903CXSCBJCRVe0y3QnDtvA>
    <xmx:dX97Z8jhb9VMxdEFgjv2GsBxPm-elbylXeKP7GmTJKG5Lz0TNS7ethoz>
Feedback-ID: i197146af:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon,
 6 Jan 2025 02:00:04 -0500 (EST)
Received: 
	by vm-mail (OpenSMTPD) with ESMTPSA id 47676500 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO);
	Mon, 6 Jan 2025 07:00:02 +0000 (UTC)
Date: Mon, 6 Jan 2025 08:00:01 +0100
From: Patrick Steinhardt <ps@pks.im>
To: =?utf-8?Q?Jean-No=C3=ABl?= Avila via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,
	=?utf-8?Q?Jean-No=C3=ABl?= Avila <jn.avila@free.fr>
Subject: Re: [PATCH] doc: git-notes.txt: migrate to new documentation format
Message-ID: <Z3t_GvqfZL9y-_9p@pks.im>
References: <pull.1846.git.1735924216993.gitgitgadget@gmail.com>
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
List-Id: <git.vger.kernel.org>
List-Subscribe: <mailto:git+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:git+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <pull.1846.git.1735924216993.gitgitgadget@gmail.com>

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?= <jn.avila@free.fr>
> 
> 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

From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from fhigh-b5-smtp.messagingengine.com (fhigh-b5-smtp.messagingengine.com [202.12.124.156])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 492131CFEB2
	for <git@vger.kernel.org>; Mon,  6 Jan 2025 15:32:11 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.156
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1736177536; cv=none; b=WdjJgohFWgFN6+wZccsrjOEXA6q13Aj8pblGZqAbLCXpaOo1ivkbViBz7aldVW2/xqu9+EgW6xXdeyFcwH/0qvn5Lcfb934GojU68HXKeF6EANunavvITKbW/33miCSAB/xM0NVuPNRhCzKn9+WLKmIfXvHNQiYW3bAn1SUFaCw=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1736177536; c=relaxed/simple;
	bh=cHoAsPy53XdUFtVvz/INLb5K53urydyHKkzz2RKHL1g=;
	h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID:
	 MIME-Version:Content-Type; b=jXyCLhBV1jEjQxQ7Qlz9zyn7ZTV5pH4Jx32JYFJRy9Iq1gV1D4g6bK7FSMljVVRRrlqq1v0oKR8TkzkRZGBAaarJA1mODSncc+ph0qiACPBb1+kJOE3UReZVG2eeqTcM3mu1ukFKGZBtl/b3zQd84hV4Z+T6ptkAy6XJMZ1jf6Q=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com; spf=pass smtp.mailfrom=pobox.com; dkim=pass (2048-bit key) header.d=pobox.com header.i=@pobox.com header.b=3Nxlse57; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=VscQFpQU; arc=none smtp.client-ip=202.12.124.156
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pobox.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=pobox.com header.i=@pobox.com header.b="3Nxlse57";
	dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="VscQFpQU"
Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42])
	by mailfhigh.stl.internal (Postfix) with ESMTP id 1129F25400E5;
	Mon,  6 Jan 2025 10:32:09 -0500 (EST)
Received: from phl-frontend-01 ([10.202.2.160])
  by phl-compute-02.internal (MEProxy); Mon, 06 Jan 2025 10:32:09 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pobox.com; h=cc
	:cc:content-type:content-type:date:date:from:from:in-reply-to
	:in-reply-to:message-id:mime-version:references:reply-to:subject
	:subject:to:to; s=fm1; t=1736177528; x=1736263928; bh=vtrK1HE3eI
	qIx2oH1sjOB3QfeqlOSRBaRzbuMRLAByk=; b=3Nxlse57oJr+bDqfdbsBaMXqgL
	RO5AqUf9bRCqExYI5DtvVq/rBqbGLDwKfV8Z4i97pSaR4li9nFsifMqCkFKoXDO0
	IKAOIGlNlNxG9PPK9/TeuuZQ0OEc7cj55NIpbFYy78ZIBNoTKq4Pujpv1QXUw8bT
	yLre99QgtwofmFiOgti+NOdcdHWCb2Tve6qlpOjNZOe+xmQ5whGxGCDb5mL0fsiQ
	e+oql1gNf5Ftt2bbjvra2Alee7ZSKwSWYD9M946YBQZg5Dz+DgNRox+6nfIJMnUB
	B/nqpNNtqLM16TJkRJCG/FeZuRr+j++FRiVjbVqDenDWsOgkiPcsB7nG/nFQ==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
	messagingengine.com; h=cc:cc:content-type:content-type:date:date
	:feedback-id:feedback-id:from:from:in-reply-to:in-reply-to
	:message-id:mime-version:references:reply-to:subject:subject:to
	:to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=
	1736177528; x=1736263928; bh=vtrK1HE3eIqIx2oH1sjOB3QfeqlOSRBaRzb
	uMRLAByk=; b=VscQFpQUVHROL0SbNk2L8wVc0lQarjLBsV85YbkYN0NVwBaHQkn
	KaUun1k9e+5iC+XeNaswr9yBQmpZFbzrb3/Kw2bxTr8Lcw7amBqIwcJDWk4uZe/C
	/s3aMrdvGhBqk+bseZ8WpbgVmA38CA4JTThsxIBaatMciElXPVMv74sdmW7p7Zfo
	PinBPPkSi/cPiUeLINRn2NatB2wmikDIZgft+u1OL2iNbgeJD3OGa/Dlmx121Wyf
	gdtZYQ07wrHnTg4tqygk42dxiX//lnGiwaMZwHFmyRn+SEeJj6HqZy01M5FY4y4N
	RRgPcUFofanONSTt+m/aAQGZ70U+rozcPeg==
X-ME-Sender: <xms:ePd7Z0UPeQZMyp0KZUhwB5qFjHXAzxpmsH-GAGwITqNNokOi9pWvcw>
    <xme:ePd7Z4ma1bZ_vejIQhJcTAlknNXhVHmiOAJSPVUFESqtsnZiTtqYZoI21qb4U_6do
    9PsZNBL1D-LL2gIHw>
X-ME-Received: <xmr:ePd7Z4Y6dv1rvDkejyXqnl3N6UsoelLuE_5fmyFg1GSuzRwGDx2T5Vdmc5L2Ej7tK7qCtYqKj-AqK070Zs4Y3wqO8KoFk17CbEPn>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegtddgjeeiucetufdoteggodetrfdotf
    fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu
    rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh
    htshculddquddttddmnecujfgurhephffvvefujghffffkfgggtgesthdtredttdertden
    ucfhrhhomheplfhunhhiohcuvecujfgrmhgrnhhouceoghhithhsthgvrhesphhosghogi
    drtghomheqnecuggftrfgrthhtvghrnhepfeevteetjeehueegffelvdetieevffeufeej
    leeuffetiefggfeftdfhfeeigeeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrg
    hmpehmrghilhhfrhhomhepghhithhsthgvrhesphhosghogidrtghomhdpnhgspghrtghp
    thhtohephedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepphhssehpkhhsrdhimh
    dprhgtphhtthhopehgihhtghhithhgrggughgvthesghhmrghilhdrtghomhdprhgtphht
    thhopehgihhtsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohepjhhnrdgrvh
    hilhgrsehfrhgvvgdrfhhrpdhrtghpthhtohepghhithhsthgvrhesphhosghogidrtgho
    mh
X-ME-Proxy: <xmx:ePd7ZzW7VpDB99ktbw6VrtDDr5h3mLHnM6oP7K8_UG2-O2nisqgSkQ>
    <xmx:ePd7Z-kXPyiA_IOVe-RXnnhq-BG2XfpWBwsCABRlb14efVLf38k-Qw>
    <xmx:ePd7Z4cgC2zJ8UzRUsQOEY4wXB9hOPMpAH83je5ZjOx3nlVUdQIGGQ>
    <xmx:ePd7ZwG1B4EPKyZSbhZ1iUVHOcFMGHeQ4QGubXl3SOHL9ZKgH6ciVQ>
    <xmx:ePd7Z1tW5J1X4bDEmllwGcfepF9167alCswoNKzAQE9rz-qcX9xJjeZp>
Feedback-ID: if26b431b:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon,
 6 Jan 2025 10:32:08 -0500 (EST)
From: Junio C Hamano <gitster@pobox.com>
To: Patrick Steinhardt <ps@pks.im>
Cc: =?utf-8?Q?Jean-No=C3=ABl?= Avila via GitGitGadget
 <gitgitgadget@gmail.com>,
  git@vger.kernel.org,  =?utf-8?Q?Jean-No=C3=ABl?= Avila <jn.avila@free.fr>
Subject: Re: [PATCH] doc: git-notes.txt: migrate to new documentation format
In-Reply-To: <Z3t_GvqfZL9y-_9p@pks.im> (Patrick Steinhardt's message of "Mon,
	6 Jan 2025 08:00:01 +0100")
References: <pull.1846.git.1735924216993.gitgitgadget@gmail.com>
	<Z3t_GvqfZL9y-_9p@pks.im>
Date: Mon, 06 Jan 2025 07:32:07 -0800
Message-ID: <xmqqldvo0xhk.fsf@gitster.g>
User-Agent: Gnus/5.13 (Gnus v5.13)
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
List-Id: <git.vger.kernel.org>
List-Subscribe: <mailto:git+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:git+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain

Patrick Steinhardt <ps@pks.im> 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.


From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp5-g21.free.fr (smtp5-g21.free.fr [212.27.42.5])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id D7082156968
	for <git@vger.kernel.org>; Tue,  7 Jan 2025 21:23:01 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.27.42.5
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1736284984; cv=none; b=mNr3TdSTY10QCHwPHBzcoWrmXbvO+ioqZMC3gsiA8Xroj3zOdyiJdzbG1ZWXvro0io8M7/KUgfTiuok2kCwtMBYhSK/APQH6J6yMvjGHqLwclNyk+XhFl74/rqlFeZeC+m6c9vWsc55QApXRpxKK6jtr9cw+EEzN+uAedyJuha8=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1736284984; c=relaxed/simple;
	bh=B7pQgoiaKq3nD5d0uNXeRu9M/QyKy6w9HYrNX/Cx29g=;
	h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:
	 MIME-Version:Content-Type; b=RyrXoU/PEJBVz6oLHGzjE4Xn1qrv4KD0RFdQur84uaUhLOQwNIMhKLvuGWd1brRXMleZoHwwHcpuZDNP6pBOMddQojxaz1LBUswgLTm+hPPoNq3qaVdL3USTPw9C138uUpZP90dDrnoTCv5525gaQOxb120RwmxzUf2CJA75hYs=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=free.fr; spf=pass smtp.mailfrom=free.fr; dkim=pass (2048-bit key) header.d=free.fr header.i=@free.fr header.b=qEmAaOV7; arc=none smtp.client-ip=212.27.42.5
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=free.fr
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=free.fr
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=free.fr header.i=@free.fr header.b="qEmAaOV7"
Received: from cayenne.localnet (unknown [IPv6:2a01:e0a:d1:f360:420b:f4aa:dd4f:83c9])
	(Authenticated sender: jn.avila@free.fr)
	by smtp5-g21.free.fr (Postfix) with ESMTPSA id EAE8E5FFA3;
	Tue,  7 Jan 2025 22:22:57 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr;
	s=smtp-20201208; t=1736284980;
	bh=B7pQgoiaKq3nD5d0uNXeRu9M/QyKy6w9HYrNX/Cx29g=;
	h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
	b=qEmAaOV7Gis1Qkiq/2PwdPs5olyzdNuL/0AfnCCSOadyjBdrbpXo10/2fEn/OWkzv
	 4tSzTs/xtvuq8Xw3NKNlOc4qvI2TqS/xpISDlvbtuMNMexmrZqXYfn+vCLV2h3TuOa
	 9PpJhl7t8+u9EPGeshkqhiDyIFOclusoOMNqKLBXCMQjROe2PYcomUaD1+AQDGNpfI
	 Ar+HxaU3DMQeY1BokcuTqdwemFAWTUpyjM/25sixoQbeQDnLNudmcUXjnZON/9iQ2h
	 wtezGpNXEzkfrgxlA4jMkJy/WG/HnHlLebeykEGkIX4EoICIx3YpQmV+iDNlDxV5UL
	 QvCr+GQFKHohw==
From: =?ISO-8859-1?Q?Jean=2DNo=EBl?= AVILA <jn.avila@free.fr>
To:
 =?ISO-8859-1?Q?Jean=2DNo=EBl?= Avila via GitGitGadget
 <gitgitgadget@gmail.com>, Patrick Steinhardt <ps@pks.im>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] doc: git-notes.txt: migrate to new documentation format
Date: Tue, 07 Jan 2025 22:22:57 +0100
Message-ID: <3330199.aeNJFYEL58@cayenne>
In-Reply-To: <Z3t_GvqfZL9y-_9p@pks.im>
References:
 <pull.1846.git.1735924216993.gitgitgadget@gmail.com>
 <Z3t_GvqfZL9y-_9p@pks.im>
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
List-Id: <git.vger.kernel.org>
List-Subscribe: <mailto:git+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:git+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="iso-8859-1"

On Monday, 6 January 2025 08:00:01 CET Patrick Steinhardt wrote:
> On Fri, Jan 03, 2025 at 05:10:16PM +0000, Jean-No=EBl Avila via GitGitGad=
get=20
wrote:
> > From: =3D?UTF-8?q?Jean-No=3DC3=3DABl=3D20Avila?=3D <jn.avila@free.fr>
> >=20
> > The git-notes manpage files were converted to the new documentation
> > format:
> >=20
> > - 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.
>=20
> 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.
>=20

=46or simple manpages, I'll do this from now on.

> 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:
>=20
>     Documentation: migrate git-restore(1) to new style format
>=20

Will do.

> > diff --git a/Documentation/config/notes.txt b/Documentation/config/note=
s.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=3D<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=3D<ref>` option accepted by
> >  those commands.
>=20
> Should this rather use "to the linkgit:git-log[1] family of commands,
> ..."?
>=20

Nice catch, although not really the primary aim of this patch. Will fix.

> > 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=20
exist, it will be
> >  quietly created when it is first needed to store a note.
> > =20
> >  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`).
>=20
> 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:`?
>=20

Good question. I usually tend to remove double quotes and replace them by b=
ack=20
quotes when the words are keywords. Here this is a string citation, but I=20
would still prefer to apply the synopsis formatting. Maybe, something light=
er=20
such as "Notes (_<refname>_):", which would just format the placeholder, wo=
uld=20
better fit.

JN




From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE8571E200F
	for <git@vger.kernel.org>; Fri, 10 Jan 2025 10:08:27 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1736503711; cv=none; b=EZuLp0V1fEXF4+q4S/aDGBY7NUlmYYnBiXtHermp+uiT9Y/WvK3JuH/zWX6gXAhABlkNwB3jTvy9DLizYnolOxy2gCmf7pqaxBCDJ5qd8j6mgOJE/PtKZz0M+tQV8N8UopZnyRHpnZJoDMGgjFmbwJipXQV9cUA5SCf9hFxcrwc=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1736503711; c=relaxed/simple;
	bh=HcY5vx/ZVK+wWeOarWyAjnQgiHY4B/fPwmFJ4u8ltFo=;
	h=Message-Id:In-Reply-To:References:From:Date:Subject:MIME-Version:
	 Content-Type:To:Cc; b=rFkG0wlnQ/hKgwvogDm6MzjA8X0h4b1K52heCWjeoQGXV1Y5H0xZUsrCiGObBM0MaHyzHIiTwOYSGATdVyctJT2BD4PDaR0jM/wIKpF5Kxodhv660bYl/Sd7Uyfn/sIpc/8hCnxJqLssMmrWVca3sD9Mv/77EiOovGNPcKdsvMw=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LReL6noR; arc=none smtp.client-ip=209.85.128.44
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LReL6noR"
Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-43623f0c574so14034215e9.2
        for <git@vger.kernel.org>; Fri, 10 Jan 2025 02:08:27 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20230601; t=1736503706; x=1737108506; darn=vger.kernel.org;
        h=cc:to:fcc:content-transfer-encoding:mime-version:subject:date:from
         :references:in-reply-to:message-id:from:to:cc:subject:date
         :message-id:reply-to;
        bh=xhiibeNNn5d+rsXmZsCR+kE0Q0A/fUcZdg6NbL8G6AA=;
        b=LReL6noRZKW7nSTQhth1dNjFccPBTQuUBh7EZ14JaYh+lCU9nqUrkeROsvzLQwTj9b
         YEENAp9yGB+61TD74hxOu6LEeeLJr/61Y5Gjgmbso9JEJK9z6ivDzEInJdqbF64bKIyq
         HTJYfoIbYS18WpiRYqwB+WLrWHsSYKL22JRBhH2M3YzXLORcxTVT1Ax6iDs4GPGEtskk
         5QLyUhSEU06Y4FAeucbsFaIz5WmtdYZPVbjytwPgaBKL3eOmnZhsspewr2HE+9eTcLGN
         HwH4dzik9Z7leRjs62PwCisUsCpKk3lxnj96Bb/YO9IH4StiYle1q+jyPHGcYw2LuTpQ
         xQ4Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1736503706; x=1737108506;
        h=cc:to:fcc:content-transfer-encoding:mime-version:subject:date:from
         :references:in-reply-to:message-id:x-gm-message-state:from:to:cc
         :subject:date:message-id:reply-to;
        bh=xhiibeNNn5d+rsXmZsCR+kE0Q0A/fUcZdg6NbL8G6AA=;
        b=n0VMKpVSyfBKt0c/3ektn8A99xxLxa0fECszGGRsXOY2GrqJlROGjNP6YfVHFWsGP6
         dPnY3MxjbD9roLe00JkT04PtLhv3aBvvVhjkETQERBOYwujlckEkHfy1YW7U134HerIt
         1b2AXlzaedPL2UEuIB0Q80/wlPo0UcZ5uISQJMt+Z+CDVbgRhQ/+uQpgQdd7/d1Dqr76
         I6yD0X6U3RzLmG27G0C8/OqlbZtk+3ij8GoAQerm10ebq0xnlTaCh0GrYkFvGhRJfSNF
         0+qUbLmK/OUwnEOSWC7Q4JP8wYwPjUKeji9NdY8g+S1fboW4QWd/RWEfoaaJ6fEqEFRC
         Dfgw==
X-Gm-Message-State: AOJu0YzCeF59e182fieYLt6MEo976lQ2KcvnUaCMf4Wic+CIj+wp7qIV
	qUBHTAENJafFo+VSbF94Rf8dMmOvIpoi8t8Q06o6vXAfes+D7VkuvbRVAw==
X-Gm-Gg: ASbGnctBlJky8PrJZC4K1Fdsk+vOrBCIurSc0qVOEx4RcQjmE+YxYHc+VsE/JRo/Ff9
	23lON+ohiSfpGUtxplYCJiS1PG+YFbbW//itHmZl3yT6yj6UJlfg15ptBeMsHvwGxYxeemr0D22
	MPbYlzFcEBQ9ZWCEABu/Id34joUByNVtqscaCjbWsuto0RcHWepghoswY6Z8EKQJ1PR1/DgehWN
	kNGIiVky31jJOPugklfTx0GPPEqyBUfR+I2MVRRKL8ShBC1gaN5lyp1/g==
X-Google-Smtp-Source: AGHT+IHaK9gyTfL3Y3oY5Cp8wNP2FDuTPt4V9d7XH1i6FnldZajJQSeB1AyoxXcxHGwSW+ac5cMZHA==
X-Received: by 2002:a05:6000:1869:b0:38a:8b2c:53ad with SMTP id ffacd0b85a97d-38a8b2c5601mr6114546f8f.39.1736503705479;
        Fri, 10 Jan 2025 02:08:25 -0800 (PST)
Received: from [127.0.0.1] ([13.74.141.28])
        by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a8e37d111sm4227262f8f.18.2025.01.10.02.08.24
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Fri, 10 Jan 2025 02:08:24 -0800 (PST)
Message-Id: <pull.1846.v2.git.1736503703573.gitgitgadget@gmail.com>
In-Reply-To: <pull.1846.git.1735924216993.gitgitgadget@gmail.com>
References: <pull.1846.git.1735924216993.gitgitgadget@gmail.com>
From: "=?UTF-8?Q?Jean-No=C3=ABl?= Avila via GitGitGadget" <gitgitgadget@gmail.com>
Date: Fri, 10 Jan 2025 10:08:23 +0000
Subject: [PATCH v2] doc: convert git-notes to new documentation format
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
List-Id: <git.vger.kernel.org>
List-Subscribe: <mailto:git+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:git+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fcc: Sent
To: git@vger.kernel.org
Cc: =?UTF-8?Q?Jean-No=C3=ABl?= Avila <jn.avila@free.fr>,
    =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>

From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>

- 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 <jn.avila@free.fr>
---
    doc: git-notes.txt: migrate to new documentation format
    
    cc: Patrick Steinhardt ps@pks.im

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1846%2Fjnavila%2Fgit-notes-new-format-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1846/jnavila/git-notes-new-format-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/1846

Range-diff vs v1:

 1:  7923846fb09 ! 1:  9c815abd55a doc: git-notes.txt: migrate to new documentation format
     @@ Metadata
      Author: Jean-Noël Avila <jn.avila@free.fr>
      
       ## Commit message ##
     -    doc: git-notes.txt: migrate to new documentation format
     +    doc: convert git-notes to new documentation format
      
     -    The git-notes manpage files were converted to the new documentation
     -    format:
     -
     -    - switching the synopsis to a synopsis block which will automatically
     +    - 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
     +    - 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 <jn.avila@free.fr>
     @@ Documentation/config/notes.txt: globs.
       +
      -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
     ++This setting can be disabled by the `--no-notes` option to the linkgit:git-log[1]
     ++family of commands, or by the `--notes=<ref>` option accepted by
       those commands.
       +
      -The effective value of "core.notesRef" (possibly overridden by
     @@ Documentation/git-notes.txt: ENVIRONMENT sections below.  If this ref does not e
       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`).
     ++message, after an unindented line saying "Notes (_<refname>_):" (or
     + "Notes:" for `refs/notes/commits`).
       
       Notes can also be added to patches prepared with `git format-patch` by
       using the `--notes` option. Such notes are added as a patch commentary


 Documentation/config/notes.txt |  32 +++---
 Documentation/git-notes.txt    | 191 +++++++++++++++++----------------
 2 files changed, 112 insertions(+), 111 deletions(-)

diff --git a/Documentation/config/notes.txt b/Documentation/config/notes.txt
index 43db8e808d7..b7e536496f5 100644
--- a/Documentation/config/notes.txt
+++ b/Documentation/config/notes.txt
@@ -1,4 +1,4 @@
-notes.mergeStrategy::
+`notes.mergeStrategy`::
 	Which merge strategy to choose by default when resolving notes
 	conflicts.  Must be one of `manual`, `ours`, `theirs`, `union`, or
 	`cat_sort_uniq`.  Defaults to `manual`.  See the "NOTES MERGE STRATEGIES"
@@ -7,17 +7,17 @@ notes.mergeStrategy::
 This setting can be overridden by passing the `--strategy` option to
 linkgit:git-notes[1].
 
-notes.<name>.mergeStrategy::
+`notes.<name>.mergeStrategy`::
 	Which merge strategy to choose when doing a notes merge into
-	refs/notes/<name>.  This overrides the more general
-	"notes.mergeStrategy".  See the "NOTES MERGE STRATEGIES" section in
+	`refs/notes/<name>`.  This overrides the more general
+	`notes.mergeStrategy`.  See the "NOTES MERGE STRATEGIES" section in
 	linkgit:git-notes[1] for more information on the available strategies.
 
-notes.displayRef::
+`notes.displayRef`::
 	Which ref (or refs, if a glob or specified more than once), in
 	addition to the default set by `core.notesRef` or
 	`GIT_NOTES_REF`, to read notes from when showing commit
-	messages with the 'git log' family of commands.
+	messages with the `git log` family of commands.
 +
 This setting can be overridden with the `GIT_NOTES_DISPLAY_REF`
 environment variable, which must be a colon separated list of refs or
@@ -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 linkgit:git-log[1]
+family of commands, or by the `--notes=<ref>` option accepted by
 those commands.
 +
-The effective value of "core.notesRef" (possibly overridden by
-GIT_NOTES_REF) is also implicitly added to the list of refs to be
+The effective value of `core.notesRef` (possibly overridden by
+`GIT_NOTES_REF`) is also implicitly added to the list of refs to be
 displayed.
 
-notes.rewrite.<command>::
-	When rewriting commits with <command> (currently `amend` or
+`notes.rewrite.<command>`::
+	When rewriting commits with _<command>_ (currently `amend` or
 	`rebase`), if this variable is `false`, git will not copy
 	notes from the original to the rewritten commit.  Defaults to
-	`true`.  See also "`notes.rewriteRef`" below.
+	`true`.  See also `notes.rewriteRef` below.
 +
 This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
 environment variable, which must be a colon separated list of refs or
 globs.
 
-notes.rewriteMode::
+`notes.rewriteMode`::
 	When copying notes during a rewrite (see the
-	"notes.rewrite.<command>" option), determines what to do if
+	`notes.rewrite.<command>` option), determines what to do if
 	the target commit already has a note.  Must be one of
 	`overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`.
 	Defaults to `concatenate`.
@@ -54,7 +54,7 @@ notes.rewriteMode::
 This setting can be overridden with the `GIT_NOTES_REWRITE_MODE`
 environment variable.
 
-notes.rewriteRef::
+`notes.rewriteRef`::
 	When copying notes during a rewrite, specifies the (fully
 	qualified) ref whose notes should be copied.  May be a glob,
 	in which case notes in all matching refs will be copied.  You
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index 84022f99d76..5c8e6ff5660 100644
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -7,19 +7,19 @@ git-notes - Add or inspect object notes
 
 SYNOPSIS
 --------
-[verse]
-'git notes' [list [<object>]]
-'git notes' add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]
-'git notes' copy [-f] ( --stdin | <from-object> [<to-object>] )
-'git notes' append [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]
-'git notes' edit [--allow-empty] [<object>] [--[no-]stripspace]
-'git notes' show [<object>]
-'git notes' merge [-v | -q] [-s <strategy> ] <notes-ref>
-'git notes' merge --commit [-v | -q]
-'git notes' merge --abort [-v | -q]
-'git notes' remove [--ignore-missing] [--stdin] [<object>...]
-'git notes' prune [-n] [-v]
-'git notes' get-ref
+[synopsis]
+git notes [list [<object>]]
+git notes add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]
+git notes copy [-f] ( --stdin | <from-object> [<to-object>] )
+git notes append [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]
+git notes edit [--allow-empty] [<object>] [--[no-]stripspace]
+git notes show [<object>]
+git notes merge [-v | -q] [-s <strategy> ] <notes-ref>
+git notes merge --commit [-v | -q]
+git notes merge --abort [-v | -q]
+git notes remove [--ignore-missing] [--stdin] [<object>...]
+git notes prune [-n] [-v]
+git notes get-ref
 
 
 DESCRIPTION
@@ -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
+message, after an unindented line saying "Notes (_<refname>_):" (or
 "Notes:" for `refs/notes/commits`).
 
 Notes can also be added to patches prepared with `git format-patch` by
 using the `--notes` option. Such notes are added as a patch commentary
 after a three dash separator line.
 
-To change which notes are shown by 'git log', see the
-"notes.displayRef" discussion in <<CONFIGURATION>>.
+To change which notes are shown by `git log`, see the
+`notes.displayRef` discussion in <<CONFIGURATION,CONFIGURATION>>.
 
-See the "notes.rewrite.<command>" configuration for a way to carry
+See the `notes.rewrite.<command>` configuration for a way to carry
 notes across commands that rewrite commits.
 
 
 SUBCOMMANDS
 -----------
 
-list::
+`list`::
 	List the notes object for a given object. If no object is
 	given, show a list of all note objects and the objects they
-	annotate (in the format "<note-object> <annotated-object>").
+	annotate (in the format "`<note-object> <annotated-object>`").
 	This is the default subcommand if no subcommand is given.
 
-add::
-	Add notes for a given object (defaults to HEAD). Abort if the
+`add`::
+	Add notes for a given object (defaults to `HEAD`). Abort if the
 	object already has notes (use `-f` to overwrite existing notes).
 	However, if you're using `add` interactively (using an editor
 	to supply the notes contents), then - instead of aborting -
@@ -71,10 +71,10 @@ add::
 	fine-tune the message(s) supplied from `-m` and `-F` options
 	interactively (using an editor) before adding the note.
 
-copy::
+`copy`::
 	Copy the notes for the first object onto the second object (defaults to
-	HEAD). Abort if the second object already has notes, or if the first
-	object has none (use -f to overwrite existing notes to the
+	`HEAD`). Abort if the second object already has notes, or if the first
+	object has none (use `-f` to overwrite existing notes to the
 	second object). This subcommand is equivalent to:
 	`git notes add [-f] -C $(git notes list <from-object>) <to-object>`
 +
@@ -84,27 +84,27 @@ In `--stdin` mode, take lines in the format
 <from-object> SP <to-object> [ SP <rest> ] LF
 ----------
 +
-on standard input, and copy the notes from each <from-object> to its
-corresponding <to-object>.  (The optional `<rest>` is ignored so that
+on standard input, and copy the notes from each _<from-object>_ to its
+corresponding _<to-object>_.  (The optional _<rest>_ is ignored so that
 the command can read the input given to the `post-rewrite` hook.)
 
-append::
+`append`::
 	Append new message(s) given by `-m` or `-F` options to an
 	existing note, or add them as a new note if one does not
-	exist, for the object (defaults to HEAD).  When appending to
+	exist, for the object (defaults to `HEAD`).  When appending to
 	an existing note, a blank line is added before each new
 	message as an inter-paragraph separator.  The separator can
 	be customized with the `--separator` option.
 	Edit the notes to be appended given by `-m` and `-F` options with
 	`-e` interactively (using an editor) before appending the note.
 
-edit::
-	Edit the notes for a given object (defaults to HEAD).
+`edit`::
+	Edit the notes for a given object (defaults to `HEAD`).
 
-show::
-	Show the notes for a given object (defaults to HEAD).
+`show`::
+	Show the notes for a given object (defaults to `HEAD`).
 
-merge::
+`merge`::
 	Merge the given notes ref into the current notes ref.
 	This will try to merge the changes made by the given
 	notes ref (called "remote") since the merge-base (if
@@ -112,35 +112,35 @@ merge::
 +
 If conflicts arise and a strategy for automatically resolving
 conflicting notes (see the "NOTES MERGE STRATEGIES" section) is not given,
-the "manual" resolver is used. This resolver checks out the
+the `manual` resolver is used. This resolver checks out the
 conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`),
 and instructs the user to manually resolve the conflicts there.
 When done, the user can either finalize the merge with
-'git notes merge --commit', or abort the merge with
-'git notes merge --abort'.
+`git notes merge --commit`, or abort the merge with
+`git notes merge --abort`.
 
-remove::
-	Remove the notes for given objects (defaults to HEAD). When
+`remove`::
+	Remove the notes for given objects (defaults to `HEAD`). When
 	giving zero or one object from the command line, this is
 	equivalent to specifying an empty note message to
 	the `edit` subcommand.
 
-prune::
+`prune`::
 	Remove all notes for non-existing/unreachable objects.
 
-get-ref::
+`get-ref`::
 	Print the current notes ref. This provides an easy way to
 	retrieve the current notes ref (e.g. from scripts).
 
 OPTIONS
 -------
--f::
---force::
+`-f`::
+`--force`::
 	When adding notes to an object that already has notes,
 	overwrite the existing notes (instead of aborting).
 
--m <msg>::
---message=<msg>::
+`-m <msg>`::
+`--message=<msg>`::
 	Use the given note message (instead of prompting).
 	If multiple `-m` options are given, their values
 	are concatenated as separate paragraphs.
@@ -148,95 +148,96 @@ OPTIONS
 	single line between paragraphs will be stripped out.
 	If you wish to keep them verbatim, use `--no-stripspace`.
 
--F <file>::
---file=<file>::
-	Take the note message from the given file.  Use '-' to
+`-F <file>`::
+`--file=<file>`::
+	Take the note message from the given file.  Use `-` to
 	read the note message from the standard input.
 	Lines starting with `#` and empty lines other than a
 	single line between paragraphs will be stripped out.
 	If you wish to keep them verbatim, use `--no-stripspace`.
 
--C <object>::
---reuse-message=<object>::
+`-C <object>`::
+`--reuse-message=<object>`::
 	Take the given blob object (for example, another note) as the
 	note message. (Use `git notes copy <object>` instead to
 	copy notes between objects.).  By default, message will be
 	copied verbatim, but if you wish to strip out the lines
 	starting with `#` and empty lines other than a single line
-	between paragraphs, use with`--stripspace` option.
+	between paragraphs, use with `--stripspace` option.
 
--c <object>::
---reedit-message=<object>::
-	Like '-C', but with `-c` the editor is invoked, so that
+`-c <object>`::
+`--reedit-message=<object>`::
+	Like `-C`, but with `-c` the editor is invoked, so that
 	the user can further edit the note message.
 
---allow-empty::
+`--allow-empty`::
 	Allow an empty note object to be stored. The default behavior is
 	to automatically remove empty notes.
 
---[no-]separator, --separator=<paragraph-break>::
+`--[no-]separator`::
+`--separator=<paragraph-break>`::
 	Specify a string used as a custom inter-paragraph separator
 	(a newline is added at the end as needed). If `--no-separator`, no
 	separators will be added between paragraphs.  Defaults to a blank
 	line.
 
---[no-]stripspace::
+`--[no-]stripspace`::
 	Strip leading and trailing whitespace from the note message.
 	Also strip out empty lines other than a single line between
 	paragraphs. Lines starting with `#` will be stripped out
 	in non-editor cases like `-m`, `-F` and `-C`, but not in
 	editor case like `git notes edit`, `-c`, etc.
 
---ref <ref>::
-	Manipulate the notes tree in <ref>.  This overrides
-	`GIT_NOTES_REF` and the "core.notesRef" configuration.  The ref
+`--ref <ref>`::
+	Manipulate the notes tree in _<ref>_.  This overrides
+	`GIT_NOTES_REF` and the `core.notesRef` configuration.  The ref
 	specifies the full refname when it begins with `refs/notes/`; when it
 	begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed
 	to form a full name of the ref.
 
---ignore-missing::
+`--ignore-missing`::
 	Do not consider it an error to request removing notes from an
 	object that does not have notes attached to it.
 
---stdin::
+`--stdin`::
 	Also read the object names to remove notes from the standard
 	input (there is no reason you cannot combine this with object
 	names from the command line).
 
--n::
---dry-run::
+`-n`::
+`--dry-run`::
 	Do not remove anything; just report the object names whose notes
 	would be removed.
 
--s <strategy>::
---strategy=<strategy>::
+`-s <strategy>`::
+`--strategy=<strategy>`::
 	When merging notes, resolve notes conflicts using the given
-	strategy. The following strategies are recognized: "manual"
-	(default), "ours", "theirs", "union" and "cat_sort_uniq".
-	This option overrides the "notes.mergeStrategy" configuration setting.
+	strategy. The following strategies are recognized: `manual`
+	(default), `ours`, `theirs`, `union` and `cat_sort_uniq`.
+	This option overrides the `notes.mergeStrategy` configuration setting.
 	See the "NOTES MERGE STRATEGIES" section below for more
 	information on each notes merge strategy.
 
---commit::
-	Finalize an in-progress 'git notes merge'. Use this option
-	when you have resolved the conflicts that 'git notes merge'
-	stored in .git/NOTES_MERGE_WORKTREE. This amends the partial
-	merge commit created by 'git notes merge' (stored in
-	.git/NOTES_MERGE_PARTIAL) by adding the notes in
-	.git/NOTES_MERGE_WORKTREE. The notes ref stored in the
-	.git/NOTES_MERGE_REF symref is updated to the resulting commit.
-
---abort::
-	Abort/reset an in-progress 'git notes merge', i.e. a notes merge
+`--commit`::
+	Finalize an in-progress `git notes merge`. Use this option
+	when you have resolved the conflicts that `git notes merge`
+	stored in `.git/NOTES_MERGE_WORKTREE`. This amends the partial
+	merge commit created by `git notes merge` (stored in
+	`.git/NOTES_MERGE_PARTIAL`) by adding the notes in
+	`.git/NOTES_MERGE_WORKTREE`. The notes ref stored in the
+	`.git/NOTES_MERGE_REF` symref is updated to the resulting commit.
+
+`--abort`::
+	Abort/reset an in-progress `git notes merge`, i.e. a notes merge
 	with conflicts. This simply removes all files related to the
 	notes merge.
 
--q::
---quiet::
+`-q`::
+`--quiet`::
 	When merging notes, operate quietly.
 
--v::
---verbose::
+`-v`::
+`--verbose`::
 	When merging notes, be more verbose.
 	When pruning notes, report all object names whose notes are
 	removed.
@@ -270,28 +271,28 @@ object, in which case the history of the notes can be read with
 NOTES MERGE STRATEGIES
 ----------------------
 
-The default notes merge strategy is "manual", which checks out
+The default notes merge strategy is `manual`, which checks out
 conflicting notes in a special work tree for resolving notes conflicts
 (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the
 conflicts in that work tree.
 When done, the user can either finalize the merge with
-'git notes merge --commit', or abort the merge with
-'git notes merge --abort'.
+`git notes merge --commit`, or abort the merge with
+`git notes merge --abort`.
 
 Users may select an automated merge strategy from among the following using
-either -s/--strategy option or configuring notes.mergeStrategy accordingly:
+either `-s`/`--strategy` option or configuring `notes.mergeStrategy` accordingly:
 
-"ours" automatically resolves conflicting notes in favor of the local
+`ours` automatically resolves conflicting notes in favor of the local
 version (i.e. the current notes ref).
 
-"theirs" automatically resolves notes conflicts in favor of the remote
+`theirs` automatically resolves notes conflicts in favor of the remote
 version (i.e. the given notes ref being merged into the current notes
 ref).
 
-"union" automatically resolves notes conflicts by concatenating the
+`union` automatically resolves notes conflicts by concatenating the
 local and remote versions.
 
-"cat_sort_uniq" is similar to "union", but in addition to concatenating
+`cat_sort_uniq` is similar to `union`, but in addition to concatenating
 the local and remote versions, this strategy also sorts the resulting
 lines, and removes duplicate lines from the result. This is equivalent
 to applying the "cat | sort | uniq" shell pipeline to the local and
@@ -320,7 +321,7 @@ Notes:
 
 In principle, a note is a regular Git blob, and any kind of
 (non-)format is accepted.  You can binary-safely create notes from
-arbitrary files using 'git hash-object':
+arbitrary files using `git hash-object`:
 
 ------------
 $ cc *.c
@@ -331,7 +332,7 @@ $ git notes --ref=built add --allow-empty -C "$blob" HEAD
 (You cannot simply use `git notes --ref=built add -F a.out HEAD`
 because that is not binary-safe.)
 Of course, it doesn't make much sense to display non-text-format notes
-with 'git log', so if you use such notes, you'll probably need to write
+with `git log`, so if you use such notes, you'll probably need to write
 some special-purpose tools to do something useful with them.
 
 
@@ -339,7 +340,7 @@ some special-purpose tools to do something useful with them.
 CONFIGURATION
 -------------
 
-core.notesRef::
+`core.notesRef`::
 	Notes ref to read and manipulate instead of
 	`refs/notes/commits`.  Must be an unabbreviated ref name.
 	This setting can be overridden through the environment and

base-commit: 1b4e9a5f8b5f048972c21fe8acafe0404096f694
-- 
gitgitgadget

