Autogenerated HTML docs for v2.50.1-369-g3f2a9
diff --git a/RelNotes/2.51.0.adoc b/RelNotes/2.51.0.adoc
index 8ff9218..33ae8f9 100644
--- a/RelNotes/2.51.0.adoc
+++ b/RelNotes/2.51.0.adoc
@@ -88,6 +88,9 @@
coming from using a variable with a wrong type to capture the
parsed values.
+ * Flipping the default hash function to SHA-256 at Git 3.0 boundary
+ is planned.
+
Fixes since v2.50
-----------------
@@ -178,6 +181,20 @@
now removes refs/heads/foo/ if the directory is otherwise not used.
(merge a3a7f20516 ps/refs-files-remove-empty-parent later to maint).
+ * "pack-objects" has been taught to avoid pointing into objects in
+ cruft packs from midx.
+
+ * "git remote" now detects remote names that overlap with each other
+ (e.g., remote nickname "outer" and "outer/inner" are used at the
+ same time), as it will lead to overlapping remote-tracking
+ branches.
+ (merge a5a727c448 jk/remote-avoid-overlapping-names later to maint).
+
+ * The gpg.program configuration variable, which names a pathname to
+ the (custom) GPG compatible program, can now be spelled with ~tilde
+ expansion.
+ (merge 7d275cd5c0 jb/gpg-program-variable-is-a-pathname later to maint).
+
* Other code cleanup, docfix, build fix, etc.
(merge b257adb571 lo/my-first-ow-doc-update later to maint).
(merge 8b34b6a220 ly/sequencer-update-squash-is-fixup-only later to maint).
@@ -201,3 +218,5 @@
(merge 953049eed8 ts/merge-orig-head-doc-fix later to maint).
(merge 0c83bbc704 rj/freebsd-sysinfo-build-fix later to maint).
(merge ad7780b38f ps/doc-pack-refs-auto-with-files-backend-fix later to maint).
+ (merge f4fa8a3687 rh/doc-glob-pathspec-fix later to maint).
+ (merge b27be108c8 ja/doc-git-log-markup later to maint).
diff --git a/diff-options.adoc b/diff-options.adoc
index 640eb6e..f3a35d8 100644
--- a/diff-options.adoc
+++ b/diff-options.adoc
@@ -37,32 +37,32 @@
endif::git-format-patch[]
ifdef::git-log[]
--m::
+`-m`::
Show diffs for merge commits in the default format. This is
similar to `--diff-merges=on`, except `-m` will
produce no output unless `-p` is given as well.
--c::
+`-c`::
Produce combined diff output for merge commits.
Shortcut for `--diff-merges=combined -p`.
---cc::
+`--cc`::
Produce dense combined diff output for merge commits.
Shortcut for `--diff-merges=dense-combined -p`.
---dd::
+`--dd`::
Produce diff with respect to first parent for both merge and
regular commits.
Shortcut for `--diff-merges=first-parent -p`.
---remerge-diff::
+`--remerge-diff`::
Produce remerge-diff output for merge commits.
Shortcut for `--diff-merges=remerge -p`.
---no-diff-merges::
+`--no-diff-merges`::
Synonym for `--diff-merges=off`.
---diff-merges=<format>::
+`--diff-merges=<format>`::
Specify diff format to be used for merge commits. Default is
{diff-merges-default} unless `--first-parent` is in use, in
which case `first-parent` is the default.
@@ -70,48 +70,54 @@
The following formats are supported:
+
--
-off, none::
+`off`::
+`none`::
Disable output of diffs for merge commits. Useful to override
implied value.
-on, m::
+`on`::
+`m`::
Make diff output for merge commits to be shown in the default
format. The default format can be changed using
`log.diffMerges` configuration variable, whose default value
is `separate`.
-first-parent, 1::
+`first-parent`::
+`1`::
Show full diff with respect to first parent. This is the same
format as `--patch` produces for non-merge commits.
-separate::
+`separate`::
Show full diff with respect to each of parents.
Separate log entry and diff is generated for each parent.
-combined, c::
+`combined`::
+`c`::
Show differences from each of the parents to the merge
result simultaneously instead of showing pairwise diff between
a parent and the result one at a time. Furthermore, it lists
only files which were modified from all parents.
-dense-combined, cc::
+`dense-combined`::
+`cc`::
Further compress output produced by `--diff-merges=combined`
by omitting uninteresting hunks whose contents in the parents
have only two variants and the merge result picks one of them
without modification.
-remerge, r::
- Remerge two-parent merge commits to create a temporary tree
+`remerge`::
+`r`:: Remerge two-parent merge commits to create a temporary tree
object--potentially containing files with conflict markers
and such. A diff is then shown between that temporary tree
and the actual merge commit.
+--
+
The output emitted when this option is used is subject to change, and
so is its interaction with other options (unless explicitly
documented).
---
---combined-all-paths::
+
+`--combined-all-paths`::
Cause combined diffs (used for merge commits) to
list the name of the file from all parents. It thus only has
effect when `--diff-merges=[dense-]combined` is in use, and
diff --git a/git-annotate.html b/git-annotate.html
index 061b553..441c475 100644
--- a/git-annotate.html
+++ b/git-annotate.html
@@ -506,25 +506,25 @@
<div class="ulist">
<ul>
<li>
-<p>number</p>
+<p><em><number></em></p>
<div class="paragraph">
<p>If <em><start></em> or <em><end></em> is a number, it specifies an
absolute line number (lines count from 1).</p>
</div>
</li>
<li>
-<p><code>/regex/</code></p>
+<p><code>/</code><em><regex></em><code>/</code></p>
<div class="paragraph">
<p>This form will use the first line matching the given
-POSIX regex. If <em><start></em> is a regex, it will search from the end of
+POSIX <em><regex></em>. If <em><start></em> is a regex, it will search from the end of
the previous <code>-L</code> range, if any, otherwise from the start of file.
-If <em><start></em> is <code>^/regex/</code>, it will search from the start of file.
-If <em><end></em> is a regex, it will search
-starting at the line given by <em><start></em>.</p>
+If <em><start></em> is <code>^/</code><em><regex></em><code>/</code>, it will search from the start of file.
+If <em><end></em> is a regex, it will search starting at the line given by
+<em><start></em>.</p>
</div>
</li>
<li>
-<p>+offset or -offset</p>
+<p><code>+</code><em><offset></em> or <code>-</code><em><offset></em></p>
<div class="paragraph">
<p>This is only valid for <em><end></em> and will specify a number
of lines before or after the line given by <em><start></em>.</p>
@@ -716,7 +716,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/git-blame.html b/git-blame.html
index 69588a7..01da0c5 100644
--- a/git-blame.html
+++ b/git-blame.html
@@ -535,25 +535,25 @@
<div class="ulist">
<ul>
<li>
-<p>number</p>
+<p><em><number></em></p>
<div class="paragraph">
<p>If <em><start></em> or <em><end></em> is a number, it specifies an
absolute line number (lines count from 1).</p>
</div>
</li>
<li>
-<p><code>/regex/</code></p>
+<p><code>/</code><em><regex></em><code>/</code></p>
<div class="paragraph">
<p>This form will use the first line matching the given
-POSIX regex. If <em><start></em> is a regex, it will search from the end of
+POSIX <em><regex></em>. If <em><start></em> is a regex, it will search from the end of
the previous <code>-L</code> range, if any, otherwise from the start of file.
-If <em><start></em> is <code>^/regex/</code>, it will search from the start of file.
-If <em><end></em> is a regex, it will search
-starting at the line given by <em><start></em>.</p>
+If <em><start></em> is <code>^/</code><em><regex></em><code>/</code>, it will search from the start of file.
+If <em><end></em> is a regex, it will search starting at the line given by
+<em><start></em>.</p>
</div>
</li>
<li>
-<p>+offset or -offset</p>
+<p><code>+</code><em><offset></em> or <code>-</code><em><offset></em></p>
<div class="paragraph">
<p>This is only valid for <em><end></em> and will specify a number
of lines before or after the line given by <em><start></em>.</p>
@@ -1099,7 +1099,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-04-17 11:52:41 -0700
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/git-branch.html b/git-branch.html
index f3910a5..54d9d33 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -818,7 +818,7 @@
</dd>
<dt class="hdlist1"><code>--format</code> <em><format></em></dt>
<dd>
-<p>A string that interpolates %(<code>fieldname</code>) from a branch ref being shown
+<p>A string that interpolates <code>%</code>(<code>fieldname</code>) from a branch ref being shown
and the object it points at. <em><format></em> is the same as
that of <a href="git-for-each-ref.html">git-for-each-ref(1)</a>.</p>
</dd>
diff --git a/git-cat-file.html b/git-cat-file.html
index a647a46..665df74 100644
--- a/git-cat-file.html
+++ b/git-cat-file.html
@@ -854,7 +854,7 @@
<div class="paragraph">
<p>You can specify the information shown for each object by using a custom
<em><format></em>. The <em><format></em> is copied literally to stdout for each
-object, with placeholders of the form %(<code>atom</code>) expanded, followed by a
+object, with placeholders of the form <code>%</code>(<code>atom</code>) expanded, followed by a
newline. The available atoms are:</p>
</div>
<div class="dlist">
@@ -896,18 +896,18 @@
at the first whitespace boundary. All characters before that
whitespace are considered to be the object name; characters
after that first run of whitespace (i.e., the "rest" of the
-line) are output in place of the %(<code>rest</code>) atom.</p>
+line) are output in place of the <code>%</code>(<code>rest</code>) atom.</p>
</dd>
</dl>
</div>
<div class="paragraph">
-<p>If no format is specified, the default format is %(<code>objectname</code>)
-%(<code>objecttype</code>) %(<code>objectsize</code>).</p>
+<p>If no format is specified, the default format is <code>%</code>(<code>objectname</code>)
+<code>%</code>(<code>objecttype</code>) <code>%</code>(<code>objectsize</code>).</p>
</div>
<div class="paragraph">
<p>If <code>--batch</code> is specified, or if <code>--batch-command</code> is used with the <code>contents</code>
command, the object information is followed by the object contents (consisting
-of %(<code>objectsize</code>) bytes), followed by a newline.</p>
+of <code>%</code>(<code>objectsize</code>) bytes), followed by a newline.</p>
</div>
<div class="paragraph">
<p>For example, <code>--batch</code> without a custom format would produce:</p>
@@ -919,7 +919,7 @@
</div>
</div>
<div class="paragraph">
-<p>Whereas <code>--batch-check=</code>'%(<code>objectname</code>) %(<code>objecttype</code>)' would produce:</p>
+<p>Whereas <code>--batch-check=</code>'%(<code>objectname</code>) <code>%</code>(<code>objecttype</code>)' would produce:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -1057,7 +1057,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-06-18 14:54:41 -0700
+Last updated 2025-06-24 11:24:02 -0700
</div>
</div>
</body>
diff --git a/git-config.html b/git-config.html
index 0a84fee..d6e0096 100644
--- a/git-config.html
+++ b/git-config.html
@@ -1691,14 +1691,14 @@
is expanded to the value of <code>$HOME</code>, and <code>~user/</code> to the
specified user’s home directory.</p>
<div class="paragraph">
-<p>If a path starts with %(<code>prefix</code>)<code>/</code>, the remainder is interpreted as a
+<p>If a path starts with <code>%</code>(<code>prefix</code>)<code>/</code>, the remainder is interpreted as a
path relative to Git’s "runtime prefix", i.e. relative to the location
-where Git itself was installed. For example, %(<code>prefix</code>)<code>/bin/</code> refers to
+where Git itself was installed. For example, <code>%</code>(<code>prefix</code>)<code>/bin/</code> refers to
the directory in which the Git executable itself lives. If Git was
compiled without runtime prefix support, the compiled-in prefix will be
substituted instead. In the unlikely event that a literal path needs to
be specified that should <em>not</em> be expanded, it needs to be prefixed by
-.<code>/</code>, like so: .<code>/</code>%(<code>prefix</code>)<code>/bin</code>.</p>
+.<code>/</code>, like so: .<code>/%</code>(<code>prefix</code>)<code>/bin</code>.</p>
</div>
</dd>
</dl>
@@ -5466,7 +5466,7 @@
</dd>
<dt class="hdlist1">gpg.program</dt>
<dd>
-<p>Use this custom program instead of "<code>gpg</code>" found on <code>$PATH</code> when
+<p>Pathname of the program to use instead of "<code>gpg</code>" when
making or verifying a PGP signature. The program must support the
same command-line interface as GPG, namely, to verify a detached
signature, "<code>gpg</code> <code>--verify</code> <code>$signature</code> <code>-</code> <$file" is run, and the
@@ -6504,18 +6504,18 @@
retains a one-to-one correspondence with the lines in the
original diff. Defaults to disabled (no filtering).</p>
</dd>
-<dt class="hdlist1">log.abbrevCommit</dt>
+<dt class="hdlist1"><code>log.abbrevCommit</code></dt>
<dd>
-<p>If true, makes
+<p>If <code>true</code>, make
<a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
<a href="git-whatchanged.html">git-whatchanged(1)</a>
assume <code>--abbrev-commit</code>. You may
override this option with <code>--no-abbrev-commit</code>.</p>
</dd>
-<dt class="hdlist1">log.date</dt>
+<dt class="hdlist1"><code>log.date</code></dt>
<dd>
-<p>Set the default date-time mode for the <em>log</em> command.
-Setting a value for log.date is similar to using <em>git log</em>'s
+<p>Set the default date-time mode for the <code>log</code> command.
+Setting a value for log.date is similar to using <code>git</code> <code>log</code>'s
<code>--date</code> option. See <a href="git-log.html">git-log(1)</a> for details.</p>
<div class="paragraph">
<p>If the format is set to "auto:foo" and the pager is in use, format
@@ -6523,61 +6523,68 @@
be used.</p>
</div>
</dd>
-<dt class="hdlist1">log.decorate</dt>
+<dt class="hdlist1"><code>log.decorate</code></dt>
<dd>
<p>Print out the ref names of any commits that are shown by the log
-command. If <em>short</em> is specified, the ref name prefixes <em>refs/heads/</em>,
-<em>refs/tags/</em> and <em>refs/remotes/</em> will not be printed. If <em>full</em> is
-specified, the full ref name (including prefix) will be printed.
-If <em>auto</em> is specified, then if the output is going to a terminal,
-the ref names are shown as if <em>short</em> were given, otherwise no ref
-names are shown. This is the same as the <code>--decorate</code> option
-of the <code>git</code> <code>log</code>.</p>
+command. Possible values are:</p>
+<div class="listingblock">
+<div class="content">
+<pre>`short`;; the ref name prefixes `refs/heads/`, `refs/tags/` and
+ `refs/remotes/` are not printed.
+`full`;; the full ref name (including prefix) are printed.
+`auto`;; if the output is going to a terminal,
+ the ref names are shown as if `short` were given, otherwise no ref
+ names are shown.</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>This is the same as the <code>--decorate</code> option of the <code>git</code> <code>log</code>.</p>
+</div>
</dd>
-<dt class="hdlist1">log.initialDecorationSet</dt>
+<dt class="hdlist1"><code>log.initialDecorationSet</code></dt>
<dd>
<p>By default, <code>git</code> <code>log</code> only shows decorations for certain known ref
namespaces. If <em>all</em> is specified, then show all refs as
decorations.</p>
</dd>
-<dt class="hdlist1">log.excludeDecoration</dt>
+<dt class="hdlist1"><code>log.excludeDecoration</code></dt>
<dd>
<p>Exclude the specified patterns from the log decorations. This is
similar to the <code>--decorate-refs-exclude</code> command-line option, but
the config option can be overridden by the <code>--decorate-refs</code>
option.</p>
</dd>
-<dt class="hdlist1">log.diffMerges</dt>
+<dt class="hdlist1"><code>log.diffMerges</code></dt>
<dd>
<p>Set diff format to be used when <code>--diff-merges=on</code> is
specified, see <code>--diff-merges</code> in <a href="git-log.html">git-log(1)</a> for
details. Defaults to <code>separate</code>.</p>
</dd>
-<dt class="hdlist1">log.follow</dt>
+<dt class="hdlist1"><code>log.follow</code></dt>
<dd>
<p>If <code>true</code>, <code>git</code> <code>log</code> will act as if the <code>--follow</code> option was used when
a single <path> is given. This has the same limitations as <code>--follow</code>,
i.e. it cannot be used to follow multiple files and does not work well
on non-linear history.</p>
</dd>
-<dt class="hdlist1">log.graphColors</dt>
+<dt class="hdlist1"><code>log.graphColors</code></dt>
<dd>
<p>A list of colors, separated by commas, that can be used to draw
history lines in <code>git</code> <code>log</code> <code>--graph</code>.</p>
</dd>
-<dt class="hdlist1">log.showRoot</dt>
+<dt class="hdlist1"><code>log.showRoot</code></dt>
<dd>
<p>If true, the initial commit will be shown as a big creation event.
This is equivalent to a diff against an empty tree.
Tools like <a href="git-log.html">git-log(1)</a> or <a href="git-whatchanged.html">git-whatchanged(1)</a>, which
normally hide the root commit will now show it. True by default.</p>
</dd>
-<dt class="hdlist1">log.showSignature</dt>
+<dt class="hdlist1"><code>log.showSignature</code></dt>
<dd>
<p>If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
<a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--show-signature</code>.</p>
</dd>
-<dt class="hdlist1">log.mailmap</dt>
+<dt class="hdlist1"><code>log.mailmap</code></dt>
<dd>
<p>If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
<a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--use-mailmap</code>, otherwise
@@ -7563,9 +7570,9 @@
<p>Alias for a --pretty= format string, as specified in
<a href="git-log.html">git-log(1)</a>. Any aliases defined here can be used just
as the built-in pretty formats could. For example,
-running <code>git</code> <code>config</code> <code>pretty.changelog</code> "format:* %H %s"
+running <code>git</code> <code>config</code> <code>pretty.changelog</code> "format:* <code>%H</code> <code>%s</code>"
would cause the invocation <code>git</code> <code>log</code> <code>--pretty=changelog</code>
-to be equivalent to running <code>git</code> <code>log</code> "--pretty=format:* %H %s".
+to be equivalent to running <code>git</code> <code>log</code> "--pretty=format:* <code>%H</code> <code>%s</code>".
Note that an alias with the same name as a built-in format
will be silently ignored.</p>
</dd>
@@ -8439,6 +8446,14 @@
the command line. See similarly named <code>pack.*</code> configuration
variables for defaults and meaning.</p>
</dd>
+<dt class="hdlist1">repack.midxMustContainCruft</dt>
+<dd>
+<p>When set to true, <a href="git-repack.html">git-repack(1)</a> will unconditionally include
+cruft pack(s), if any, in the multi-pack index when invoked with
+<code>--write-midx</code>. When false, cruft packs are only included in the MIDX
+when necessary (e.g., because they might be required to form a
+reachability closure with MIDX bitmaps). Defaults to true.</p>
+</dd>
<dt class="hdlist1">rerere.autoUpdate</dt>
<dd>
<p>When set to true, <code>git-rerere</code> updates the index with the
@@ -8510,7 +8525,7 @@
</div>
<div class="paragraph">
<p>The value of this setting is interpolated, i.e. <code>~/</code><em><path></em> expands to a
-path relative to the home directory and %(<code>prefix</code>)<code>/</code><em><path></em> expands to a
+path relative to the home directory and <code>%</code>(<code>prefix</code>)<code>/</code><em><path></em> expands to a
path relative to Git’s (runtime) prefix.</p>
</div>
<div class="paragraph">
diff --git a/git-daemon.html b/git-daemon.html
index 4e55206..328a387 100644
--- a/git-daemon.html
+++ b/git-daemon.html
@@ -529,10 +529,10 @@
<dd>
<p>To support virtual hosting, an interpolated path template can be
used to dynamically construct alternate paths. The template
-supports %H for the target hostname as supplied by the client but
-converted to all lowercase, %CH for the canonical hostname,
-%IP for the server’s IP address, %P for the port number,
-and %D for the absolute path of the named repository.
+supports <code>%H</code> for the target hostname as supplied by the client but
+converted to all lowercase, <code>%CH</code> for the canonical hostname,
+<code>%IP</code> for the server’s IP address, <code>%P</code> for the port number,
+and <code>%D</code> for the absolute path of the named repository.
After interpolation, the path is validated against the directory
list.</p>
</dd>
@@ -700,8 +700,8 @@
<dd>
<p>Every time a client connects, first run an external command
specified by the <path> with service name (e.g. "upload-pack"),
-path to the repository, hostname (%H), canonical hostname
-(%CH), IP address (%IP), and TCP port (%P) as its command-line
+path to the repository, hostname (<code>%H</code>), canonical hostname
+(<code>%CH</code>), IP address (<code>%IP</code>), and TCP port (<code>%P</code>) as its command-line
arguments. The external command can decide to decline the
service by exiting with a non-zero status (or to allow it by
exiting with a zero status). It can also look at the $REMOTE_ADDR
@@ -878,7 +878,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-05-27 15:29:51 -0700
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/git-diff-files.html b/git-diff-files.html
index 3e3c846..8bdd1e6 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -996,7 +996,7 @@
few lines that happen to match textually as the context, but as a
single deletion of everything old followed by a single insertion of
everything new, and the number <em><m></em> controls this aspect of the <code>-B</code>
-option (defaults to 60%). <code>-B/70</code>% specifies that less than 30% of the
+option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
original should remain in the result for Git to consider it a total
rewrite (i.e. otherwise the resulting patch will be a series of
deletion and insertion mixed together with context lines).</p>
@@ -1005,7 +1005,7 @@
<p>When used with <code>-M</code>, a totally-rewritten file is also considered as the
source of a rename (usually <code>-M</code> only considers a file that disappeared
as the source of a rename), and the number <em><n></em> controls this aspect of
-the <code>-B</code> option (defaults to 50%). <code>-B20</code>% specifies that a change with
+the <code>-B</code> option (defaults to 50%). <code>-B20%</code> specifies that a change with
addition and deletion compared to 20% or more of the file’s size are
eligible for being picked up as a possible source of a rename to
another file.</p>
@@ -1017,13 +1017,13 @@
<p>Detect renames.
If <em><n></em> is specified, it is a threshold on the similarity
index (i.e. amount of addition/deletions compared to the
-file’s size). For example, <code>-M90</code>% means Git should consider a
+file’s size). For example, <code>-M90%</code> means Git should consider a
delete/add pair to be a rename if more than 90% of the file
-hasn’t changed. Without a % sign, the number is to be read as
+hasn’t changed. Without a <code>%</code> sign, the number is to be read as
a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
-0.5, and is thus the same as <code>-M50</code>%. Similarly, <code>-M05</code> is
-the same as <code>-M5</code>%. To limit detection to exact renames, use
-<code>-M100</code>%. The default similarity index is 50%.</p>
+0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is
+the same as <code>-M5%</code>. To limit detection to exact renames, use
+<code>-M100%</code>. The default similarity index is 50%.</p>
</dd>
<dt class="hdlist1"><code>-C</code>[<em><n></em>]</dt>
<dt class="hdlist1"><code>--find-copies</code>[<code>=</code><em><n></em>]</dt>
@@ -2016,7 +2016,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/git-diff-index.html b/git-diff-index.html
index 2916fc1..395727c 100644
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -997,7 +997,7 @@
few lines that happen to match textually as the context, but as a
single deletion of everything old followed by a single insertion of
everything new, and the number <em><m></em> controls this aspect of the <code>-B</code>
-option (defaults to 60%). <code>-B/70</code>% specifies that less than 30% of the
+option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
original should remain in the result for Git to consider it a total
rewrite (i.e. otherwise the resulting patch will be a series of
deletion and insertion mixed together with context lines).</p>
@@ -1006,7 +1006,7 @@
<p>When used with <code>-M</code>, a totally-rewritten file is also considered as the
source of a rename (usually <code>-M</code> only considers a file that disappeared
as the source of a rename), and the number <em><n></em> controls this aspect of
-the <code>-B</code> option (defaults to 50%). <code>-B20</code>% specifies that a change with
+the <code>-B</code> option (defaults to 50%). <code>-B20%</code> specifies that a change with
addition and deletion compared to 20% or more of the file’s size are
eligible for being picked up as a possible source of a rename to
another file.</p>
@@ -1018,13 +1018,13 @@
<p>Detect renames.
If <em><n></em> is specified, it is a threshold on the similarity
index (i.e. amount of addition/deletions compared to the
-file’s size). For example, <code>-M90</code>% means Git should consider a
+file’s size). For example, <code>-M90%</code> means Git should consider a
delete/add pair to be a rename if more than 90% of the file
-hasn’t changed. Without a % sign, the number is to be read as
+hasn’t changed. Without a <code>%</code> sign, the number is to be read as
a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
-0.5, and is thus the same as <code>-M50</code>%. Similarly, <code>-M05</code> is
-the same as <code>-M5</code>%. To limit detection to exact renames, use
-<code>-M100</code>%. The default similarity index is 50%.</p>
+0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is
+the same as <code>-M5%</code>. To limit detection to exact renames, use
+<code>-M100%</code>. The default similarity index is 50%.</p>
</dd>
<dt class="hdlist1"><code>-C</code>[<em><n></em>]</dt>
<dt class="hdlist1"><code>--find-copies</code>[<code>=</code><em><n></em>]</dt>
@@ -2147,7 +2147,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/git-diff-pairs.html b/git-diff-pairs.html
index f626b9d..1f403ff 100644
--- a/git-diff-pairs.html
+++ b/git-diff-pairs.html
@@ -1035,7 +1035,7 @@
few lines that happen to match textually as the context, but as a
single deletion of everything old followed by a single insertion of
everything new, and the number <em><m></em> controls this aspect of the <code>-B</code>
-option (defaults to 60%). <code>-B/70</code>% specifies that less than 30% of the
+option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
original should remain in the result for Git to consider it a total
rewrite (i.e. otherwise the resulting patch will be a series of
deletion and insertion mixed together with context lines).</p>
@@ -1044,7 +1044,7 @@
<p>When used with <code>-M</code>, a totally-rewritten file is also considered as the
source of a rename (usually <code>-M</code> only considers a file that disappeared
as the source of a rename), and the number <em><n></em> controls this aspect of
-the <code>-B</code> option (defaults to 50%). <code>-B20</code>% specifies that a change with
+the <code>-B</code> option (defaults to 50%). <code>-B20%</code> specifies that a change with
addition and deletion compared to 20% or more of the file’s size are
eligible for being picked up as a possible source of a rename to
another file.</p>
@@ -1056,13 +1056,13 @@
<p>Detect renames.
If <em><n></em> is specified, it is a threshold on the similarity
index (i.e. amount of addition/deletions compared to the
-file’s size). For example, <code>-M90</code>% means Git should consider a
+file’s size). For example, <code>-M90%</code> means Git should consider a
delete/add pair to be a rename if more than 90% of the file
-hasn’t changed. Without a % sign, the number is to be read as
+hasn’t changed. Without a <code>%</code> sign, the number is to be read as
a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
-0.5, and is thus the same as <code>-M50</code>%. Similarly, <code>-M05</code> is
-the same as <code>-M5</code>%. To limit detection to exact renames, use
-<code>-M100</code>%. The default similarity index is 50%.</p>
+0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is
+the same as <code>-M5%</code>. To limit detection to exact renames, use
+<code>-M100%</code>. The default similarity index is 50%.</p>
</dd>
<dt class="hdlist1"><code>-C</code>[<em><n></em>]</dt>
<dt class="hdlist1"><code>--find-copies</code>[<code>=</code><em><n></em>]</dt>
@@ -1698,7 +1698,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-03-26 00:41:02 -0700
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/git-diff-tree.html b/git-diff-tree.html
index 929a956..8aac898 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -1002,7 +1002,7 @@
few lines that happen to match textually as the context, but as a
single deletion of everything old followed by a single insertion of
everything new, and the number <em><m></em> controls this aspect of the <code>-B</code>
-option (defaults to 60%). <code>-B/70</code>% specifies that less than 30% of the
+option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
original should remain in the result for Git to consider it a total
rewrite (i.e. otherwise the resulting patch will be a series of
deletion and insertion mixed together with context lines).</p>
@@ -1011,7 +1011,7 @@
<p>When used with <code>-M</code>, a totally-rewritten file is also considered as the
source of a rename (usually <code>-M</code> only considers a file that disappeared
as the source of a rename), and the number <em><n></em> controls this aspect of
-the <code>-B</code> option (defaults to 50%). <code>-B20</code>% specifies that a change with
+the <code>-B</code> option (defaults to 50%). <code>-B20%</code> specifies that a change with
addition and deletion compared to 20% or more of the file’s size are
eligible for being picked up as a possible source of a rename to
another file.</p>
@@ -1023,13 +1023,13 @@
<p>Detect renames.
If <em><n></em> is specified, it is a threshold on the similarity
index (i.e. amount of addition/deletions compared to the
-file’s size). For example, <code>-M90</code>% means Git should consider a
+file’s size). For example, <code>-M90%</code> means Git should consider a
delete/add pair to be a rename if more than 90% of the file
-hasn’t changed. Without a % sign, the number is to be read as
+hasn’t changed. Without a <code>%</code> sign, the number is to be read as
a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
-0.5, and is thus the same as <code>-M50</code>%. Similarly, <code>-M05</code> is
-the same as <code>-M5</code>%. To limit detection to exact renames, use
-<code>-M100</code>%. The default similarity index is 50%.</p>
+0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is
+the same as <code>-M5%</code>. To limit detection to exact renames, use
+<code>-M100%</code>. The default similarity index is 50%.</p>
</dd>
<dt class="hdlist1"><code>-C</code>[<em><n></em>]</dt>
<dt class="hdlist1"><code>--find-copies</code>[<code>=</code><em><n></em>]</dt>
@@ -1454,47 +1454,56 @@
<p>This flag causes <em>git diff-tree --stdin</em> to also show
the commit message before the differences.</p>
</dd>
-<dt class="hdlist1">--pretty[=<format>]</dt>
-<dt class="hdlist1">--format=<format></dt>
+<dt class="hdlist1"><code>--pretty</code>[<code>=</code><em><format></em>]</dt>
+<dt class="hdlist1"><code>--format=</code><em><format></em></dt>
<dd>
<p>Pretty-print the contents of the commit logs in a given format,
-where <em><format></em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,
-<em>full</em>, <em>fuller</em>, <em>reference</em>, <em>email</em>, <em>raw</em>, <em>format:<string></em>
-and <em>tformat:<string></em>. When <em><format></em> is none of the above,
-and has <em>%placeholder</em> in it, it acts as if
-<em>--pretty=tformat:<format></em> were given.</p>
+where <em><format></em> can be one of <code>oneline</code>, <code>short</code>, <code>medium</code>,
+<code>full</code>, <code>fuller</code>, <code>reference</code>, <code>email</code>, <code>raw</code>, <code>format:</code><em><string></em>
+and <code>tformat:</code><em><string></em>. When <em><format></em> is none of the above,
+and has <code>%</code><em><placeholder></em> in it, it acts as if
+<code>--pretty=tformat:</code><em><format></em> were given.</p>
<div class="paragraph">
<p>See the "PRETTY FORMATS" section for some additional details for each
-format. When <em>=<format></em> part is omitted, it defaults to <em>medium</em>.</p>
+format. When <code>=</code><em><format></em> part is omitted, it defaults to <code>medium</code>.</p>
</div>
-<div class="paragraph">
-<p>Note: you can specify the default pretty format in the repository
-configuration (see <a href="git-config.html">git-config(1)</a>).</p>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+you can specify the default pretty format in the repository
+configuration (see <a href="git-config.html">git-config(1)</a>).
+</td>
+</tr>
+</table>
</div>
</dd>
-<dt class="hdlist1">--abbrev-commit</dt>
+<dt class="hdlist1"><code>--abbrev-commit</code></dt>
<dd>
<p>Instead of showing the full 40-byte hexadecimal commit object
name, show a prefix that names the object uniquely.
-"--abbrev=<n>" (which also modifies diff output, if it is displayed)
+<code>--abbrev=</code><em><n></em> (which also modifies diff output, if it is displayed)
option can be used to specify the minimum length of the prefix.</p>
<div class="paragraph">
-<p>This should make "--pretty=oneline" a whole lot more readable for
+<p>This should make <code>--pretty=oneline</code> a whole lot more readable for
people using 80-column terminals.</p>
</div>
</dd>
-<dt class="hdlist1">--no-abbrev-commit</dt>
+<dt class="hdlist1"><code>--no-abbrev-commit</code></dt>
<dd>
<p>Show the full 40-byte hexadecimal commit object name. This negates
<code>--abbrev-commit</code>, either explicit or implied by other options such
-as "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.</p>
+as <code>--oneline</code>. It also overrides the <code>log.abbrevCommit</code> variable.</p>
</dd>
-<dt class="hdlist1">--oneline</dt>
+<dt class="hdlist1"><code>--oneline</code></dt>
<dd>
-<p>This is a shorthand for "--pretty=oneline --abbrev-commit"
+<p>This is a shorthand for <code>--pretty=oneline</code> <code>--abbrev-commit</code>
used together.</p>
</dd>
-<dt class="hdlist1">--encoding=<encoding></dt>
+<dt class="hdlist1"><code>--encoding=</code><em><encoding></em></dt>
<dd>
<p>Commit objects record the character encoding used for the log message
in their encoding header; this option can be used to tell the
@@ -1507,9 +1516,9 @@
to convert the commit, we will quietly output the original
object verbatim.</p>
</dd>
-<dt class="hdlist1">--expand-tabs=<n></dt>
-<dt class="hdlist1">--expand-tabs</dt>
-<dt class="hdlist1">--no-expand-tabs</dt>
+<dt class="hdlist1"><code>--expand-tabs=</code><em><n></em></dt>
+<dt class="hdlist1"><code>--expand-tabs</code></dt>
+<dt class="hdlist1"><code>--no-expand-tabs</code></dt>
<dd>
<p>Perform a tab expansion (replace each tab with enough spaces
to fill to the next display column that is a multiple of <em><n></em>)
@@ -1519,11 +1528,11 @@
which disables tab expansion.</p>
<div class="paragraph">
<p>By default, tabs are expanded in pretty formats that indent the log
-message by 4 spaces (i.e. <em>medium</em>, which is the default, <em>full</em>,
-and <em>fuller</em>).</p>
+message by 4 spaces (i.e. <code>medium</code>, which is the default, <code>full</code>,
+and <code>fuller</code>).</p>
</div>
</dd>
-<dt class="hdlist1">--notes[=<ref>]</dt>
+<dt class="hdlist1"><code>--notes</code>[<code>=</code><em><ref></em>]</dt>
<dd>
<p>Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the
commit, when showing the commit log message. This is the default
@@ -1542,32 +1551,33 @@
<code>refs/notes/</code> is prefixed to form the full name of the ref.</p>
</div>
<div class="paragraph">
-<p>Multiple --notes options can be combined to control which notes are
-being displayed. Examples: "--notes=foo" will show only notes from
-"refs/notes/foo"; "--notes=foo --notes" will show both notes from
+<p>Multiple <code>--notes</code> options can be combined to control which notes are
+being displayed. Examples: "<code>--notes=foo</code>" will show only notes from
+<code>refs/notes/foo</code>; "<code>--notes=foo</code> <code>--notes</code>" will show both notes from
"refs/notes/foo" and from the default notes ref(s).</p>
</div>
</dd>
-<dt class="hdlist1">--no-notes</dt>
+<dt class="hdlist1"><code>--no-notes</code></dt>
<dd>
<p>Do not show notes. This negates the above <code>--notes</code> option, by
resetting the list of notes refs from which notes are shown.
Options are parsed in the order given on the command line, so e.g.
-"--notes --notes=foo --no-notes --notes=bar" will only show notes
-from "refs/notes/bar".</p>
+"<code>--notes</code> <code>--notes=foo</code> <code>--no-notes</code> <code>--notes=bar</code>" will only show notes
+from <code>refs/notes/bar</code>.</p>
</dd>
-<dt class="hdlist1">--show-notes-by-default</dt>
+<dt class="hdlist1"><code>--show-notes-by-default</code></dt>
<dd>
<p>Show the default notes unless options for displaying specific
notes are given.</p>
</dd>
-<dt class="hdlist1">--show-notes[=<ref>]</dt>
-<dt class="hdlist1">--[no-]standard-notes</dt>
+<dt class="hdlist1"><code>--show-notes</code>[<code>=</code><em><ref></em>]</dt>
+<dt class="hdlist1"><code>--standard-notes</code></dt>
+<dt class="hdlist1"><code>--no-standard-notes</code></dt>
<dd>
-<p>These options are deprecated. Use the above --notes/--no-notes
+<p>These options are deprecated. Use the above <code>--notes</code>/<code>--no-notes</code>
options instead.</p>
</dd>
-<dt class="hdlist1">--show-signature</dt>
+<dt class="hdlist1"><code>--show-signature</code></dt>
<dd>
<p>Check the validity of a signed commit object by passing the signature
to <code>gpg</code> <code>--verify</code> and show the output.</p>
@@ -1621,11 +1631,11 @@
<div class="sectionbody">
<div class="paragraph">
<p>If the commit is a merge, and if the pretty-format
-is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
-inserted before the <em>Author:</em> line. This line begins with
+is not <code>oneline</code>, <code>email</code> or <code>raw</code>, an additional line is
+inserted before the <code>Author:</code> line. This line begins with
"Merge: " and the hashes of ancestral commits are printed,
separated by spaces. Note that the listed commits may not
-necessarily be the list of the <strong>direct</strong> parent commits if you
+necessarily be the list of the <em>direct</em> parent commits if you
have limited your view of history: for example, if you are
only interested in changes related to a certain directory or
file.</p>
@@ -1634,14 +1644,14 @@
<p>There are several built-in formats, and you can define
additional formats by setting a pretty.<name>
config option to either another format name, or a
-<em>format:</em> string, as described below (see
+<code>format:</code> string, as described below (see
<a href="git-config.html">git-config(1)</a>). Here are the details of the
built-in formats:</p>
</div>
<div class="ulist">
<ul>
<li>
-<p><em>oneline</em></p>
+<p><code>oneline</code></p>
<div class="literalblock">
<div class="content">
<pre><hash> <title-line></pre>
@@ -1652,7 +1662,7 @@
</div>
</li>
<li>
-<p><em>short</em></p>
+<p><code>short</code></p>
<div class="literalblock">
<div class="content">
<pre>commit <hash>
@@ -1666,7 +1676,7 @@
</div>
</li>
<li>
-<p><em>medium</em></p>
+<p><code>medium</code></p>
<div class="literalblock">
<div class="content">
<pre>commit <hash>
@@ -1686,7 +1696,7 @@
</div>
</li>
<li>
-<p><em>full</em></p>
+<p><code>full</code></p>
<div class="literalblock">
<div class="content">
<pre>commit <hash>
@@ -1706,7 +1716,7 @@
</div>
</li>
<li>
-<p><em>fuller</em></p>
+<p><code>fuller</code></p>
<div class="literalblock">
<div class="content">
<pre>commit <hash>
@@ -1728,7 +1738,7 @@
</div>
</li>
<li>
-<p><em>reference</em></p>
+<p><code>reference</code></p>
<div class="literalblock">
<div class="content">
<pre><abbrev-hash> (<title-line>, <short-author-date>)</pre>
@@ -1736,7 +1746,7 @@
</div>
<div class="paragraph">
<p>This format is used to refer to another commit in a commit message and
-is the same as <code>--pretty=</code>'format:%C(<code>auto</code>)%h (%s, %ad)'. By default,
+is the same as <code>--pretty=</code>'format:%C(<code>auto</code>)<code>%h</code> (<code>%s,</code> <code>%ad</code>)'. By default,
the date is formatted with <code>--date=short</code> unless another <code>--date</code> option
is explicitly specified. As with any <code>format:</code> with format
placeholders, its output is not affected by other options like
@@ -1744,7 +1754,7 @@
</div>
</li>
<li>
-<p><em>email</em></p>
+<p><code>email</code></p>
<div class="literalblock">
<div class="content">
<pre>From <hash> <date>
@@ -1760,20 +1770,20 @@
</div>
</li>
<li>
-<p><em>mboxrd</em></p>
+<p><code>mboxrd</code></p>
<div class="paragraph">
-<p>Like <em>email</em>, but lines in the commit message starting with "From "
+<p>Like <code>email</code>, but lines in the commit message starting with "From "
(preceded by zero or more ">") are quoted with ">" so they aren’t
confused as starting a new commit.</p>
</div>
</li>
<li>
-<p><em>raw</em></p>
+<p><code>raw</code></p>
<div class="paragraph">
-<p>The <em>raw</em> format shows the entire commit exactly as
+<p>The <code>raw</code> format shows the entire commit exactly as
stored in the commit object. Notably, the hashes are
-displayed in full, regardless of whether --abbrev or
---no-abbrev are used, and <em>parents</em> information show the
+displayed in full, regardless of whether <code>--abbrev</code> or
+<code>--no-abbrev</code> are used, and <em>parents</em> information show the
true parent commits, without taking grafts or history
simplification into account. Note that this format affects the way
commits are displayed, but not the way the diff is shown e.g. with
@@ -1782,12 +1792,12 @@
</div>
</li>
<li>
-<p><em>format:<format-string></em></p>
+<p><code>format:</code><em><format-string></em></p>
<div class="paragraph">
-<p>The <em>format:<format-string></em> format allows you to specify which information
+<p>The <code>format:</code><em><format-string></em> format allows you to specify which information
you want to show. It works a little bit like printf format,
-with the notable exception that you get a newline with <em>%n</em>
-instead of <em>\n</em>.</p>
+with the notable exception that you get a newline with <code>%n</code>
+instead of <code>\n</code>.</p>
</div>
<div class="paragraph">
<p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
@@ -1808,17 +1818,17 @@
<p>Placeholders that expand to a single literal character:</p>
<div class="dlist">
<dl>
-<dt class="hdlist1"><em>%n</em></dt>
+<dt class="hdlist1"><code>%n</code></dt>
<dd>
<p>newline</p>
</dd>
-<dt class="hdlist1"><em>%%</em></dt>
+<dt class="hdlist1"><code>%%</code></dt>
<dd>
-<p>a raw <em>%</em></p>
+<p>a raw <code>%</code></p>
</dd>
-<dt class="hdlist1"><em>%x00</em></dt>
+<dt class="hdlist1"><code>%x00</code></dt>
<dd>
-<p><em>%x</em> followed by two hexadecimal digits is replaced with a
+<p><code>%x</code> followed by two hexadecimal digits is replaced with a
byte with the hexadecimal digits' value (we will call this
"literal formatting code" in the rest of this document).</p>
</dd>
@@ -1829,60 +1839,60 @@
<p>Placeholders that affect formatting of later placeholders:</p>
<div class="dlist">
<dl>
-<dt class="hdlist1"><em>%Cred</em></dt>
+<dt class="hdlist1"><code>%Cred</code></dt>
<dd>
<p>switch color to red</p>
</dd>
-<dt class="hdlist1"><em>%Cgreen</em></dt>
+<dt class="hdlist1"><code>%Cgreen</code></dt>
<dd>
<p>switch color to green</p>
</dd>
-<dt class="hdlist1"><em>%Cblue</em></dt>
+<dt class="hdlist1"><code>%Cblue</code></dt>
<dd>
<p>switch color to blue</p>
</dd>
-<dt class="hdlist1"><em>%Creset</em></dt>
+<dt class="hdlist1"><code>%Creset</code></dt>
<dd>
<p>reset color</p>
</dd>
-<dt class="hdlist1"><em>%C(…​)</em></dt>
+<dt class="hdlist1"><code>%C</code>(<em><spec></em>)</dt>
<dd>
<p>color specification, as described under Values in the
"CONFIGURATION FILE" section of <a href="git-config.html">git-config(1)</a>. By
default, colors are shown only when enabled for log output
(by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and respecting
the <code>auto</code> settings of the former if we are going to a
-terminal). %C(<code>auto,</code><code>...</code>) is accepted as a historical
-synonym for the default (e.g., %C(<code>auto,red</code>)). Specifying
-%C(<code>always,</code><code>...</code>) will show the colors even when color is
+terminal). <code>%C</code>(<code>auto,</code><em><spec></em>) is accepted as a historical
+synonym for the default (e.g., <code>%C</code>(<code>auto,red</code>)). Specifying
+<code>%C</code>(<code>always,</code><em><spec></em>) will show the colors even when color is
not otherwise enabled (though consider just using
-<code>--color=always</code> to enable color for the whole output,
+<code>--color=always</code> to enable color for the whole output,
including this format and anything else git might color).
-<code>auto</code> alone (i.e. %C(<code>auto</code>)) will turn on auto coloring
+<code>auto</code> alone (i.e. <code>%C</code>(<code>auto</code>)) will turn on auto coloring
on the next placeholders until the color is switched
again.</p>
</dd>
-<dt class="hdlist1"><em>%m</em></dt>
+<dt class="hdlist1"><code>%m</code></dt>
<dd>
<p>left (<), right (>) or boundary (<code>-</code>) mark</p>
</dd>
-<dt class="hdlist1"><em>%w([<w>[,<i1>[,<i2>]]])</em></dt>
+<dt class="hdlist1"><code>%w</code>([<em><w></em>[<code>,</code><em><i1></em>[<code>,</code><em><i2></em>]]])</dt>
<dd>
-<p>switch line wrapping, like the -w option of
+<p>switch line wrapping, like the <code>-w</code> option of
<a href="git-shortlog.html">git-shortlog(1)</a>.</p>
</dd>
-<dt class="hdlist1"><em>%<( <N> [,trunc|ltrunc|mtrunc])</em></dt>
+<dt class="hdlist1"><code>%</code><(<em><n></em>[<code>,</code>(<code>trunc</code>|<code>ltrunc</code>|<code>mtrunc</code>)])</dt>
<dd>
<p>make the next placeholder take at
least N column widths, padding spaces on
the right if necessary. Optionally
-truncate (with ellipsis <em>..</em>) at the left (ltrunc) <code>..</code><code>ft</code>,
+truncate (with ellipsis <code>..</code>) at the left (ltrunc) <code>..</code><code>ft</code>,
the middle (mtrunc) <code>mi</code><code>..</code><code>le</code>, or the end
(trunc) <code>rig..</code>, if the output is longer than
-N columns.
+<em><n></em> columns.
Note 1: that truncating
-only works correctly with N >= 2.
-Note 2: spaces around the N and M (see below)
+only works correctly with <em><n></em> >= 2.
+Note 2: spaces around the <em><n></em> and <em><m></em> (see below)
values are optional.
Note 3: Emojis and other wide characters
will take two display columns, which may
@@ -1890,29 +1900,32 @@
Note 4: decomposed character combining marks
may be misplaced at padding boundaries.</p>
</dd>
-<dt class="hdlist1"><em>%<|( <M> )</em></dt>
+<dt class="hdlist1"><code>%</code><|(<em><m></em> )</dt>
<dd>
-<p>make the next placeholder take at least until Mth
+<p>make the next placeholder take at least until <em><m></em> th
display column, padding spaces on the right if necessary.
-Use negative M values for column positions measured
+Use negative <em><m></em> values for column positions measured
from the right hand edge of the terminal window.</p>
</dd>
-<dt class="hdlist1"><em>%>( <N> )</em>, <em>%>|( <M> )</em></dt>
+<dt class="hdlist1"><code>%</code>>(<em><n></em>)</dt>
+<dt class="hdlist1"><code>%</code>>|(<em><m></em>)</dt>
<dd>
-<p>similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em> respectively,
+<p>similar to <code>%</code><(<em><n></em>), <code>%</code><|(<em><m></em>) respectively,
but padding spaces on the left</p>
</dd>
-<dt class="hdlist1"><em>%>>( <N> )</em>, <em>%>>|( <M> )</em></dt>
+<dt class="hdlist1"><code>%</code>>>(<em><n></em>)</dt>
+<dt class="hdlist1"><code>%</code>>>|(<em><m></em>)</dt>
<dd>
-<p>similar to <em>%>( <N> )</em>, <em>%>|( <M> )</em>
+<p>similar to <code>%</code>>(<em><n></em>), <code>%</code>>|(<em><m></em>)
respectively, except that if the next
placeholder takes more spaces than given and
there are spaces on its left, use those
spaces</p>
</dd>
-<dt class="hdlist1"><em>%><( <N> )</em>, <em>%><|( <M> )</em></dt>
+<dt class="hdlist1"><code>%</code>><(<em><n></em>)</dt>
+<dt class="hdlist1"><code>%</code>><|(<em><m></em>)</dt>
<dd>
-<p>similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em>
+<p>similar to <code>%</code><(<em><n></em>), <code>%</code><|(<em><m></em>)
respectively, but padding both sides
(i.e. the text is centered)</p>
</dd>
@@ -1923,181 +1936,181 @@
<p>Placeholders that expand to information extracted from the commit:</p>
<div class="dlist">
<dl>
-<dt class="hdlist1"><em>%H</em></dt>
+<dt class="hdlist1"><code>%H</code></dt>
<dd>
<p>commit hash</p>
</dd>
-<dt class="hdlist1"><em>%h</em></dt>
+<dt class="hdlist1"><code>%h</code></dt>
<dd>
<p>abbreviated commit hash</p>
</dd>
-<dt class="hdlist1"><em>%T</em></dt>
+<dt class="hdlist1"><code>%T</code></dt>
<dd>
<p>tree hash</p>
</dd>
-<dt class="hdlist1"><em>%t</em></dt>
+<dt class="hdlist1"><code>%t</code></dt>
<dd>
<p>abbreviated tree hash</p>
</dd>
-<dt class="hdlist1"><em>%P</em></dt>
+<dt class="hdlist1"><code>%P</code></dt>
<dd>
<p>parent hashes</p>
</dd>
-<dt class="hdlist1"><em>%p</em></dt>
+<dt class="hdlist1"><code>%p</code></dt>
<dd>
<p>abbreviated parent hashes</p>
</dd>
-<dt class="hdlist1"><em>%an</em></dt>
+<dt class="hdlist1"><code>%an</code></dt>
<dd>
<p>author name</p>
</dd>
-<dt class="hdlist1"><em>%aN</em></dt>
+<dt class="hdlist1"><code>%aN</code></dt>
<dd>
<p>author name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a>
or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%ae</em></dt>
+<dt class="hdlist1"><code>%ae</code></dt>
<dd>
<p>author email</p>
</dd>
-<dt class="hdlist1"><em>%aE</em></dt>
+<dt class="hdlist1"><code>%aE</code></dt>
<dd>
<p>author email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a>
or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%al</em></dt>
+<dt class="hdlist1"><code>%al</code></dt>
<dd>
-<p>author email local-part (the part before the <em>@</em> sign)</p>
+<p>author email local-part (the part before the <code>@</code> sign)</p>
</dd>
-<dt class="hdlist1"><em>%aL</em></dt>
+<dt class="hdlist1"><code>%aL</code></dt>
<dd>
-<p>author local-part (see <em>%al</em>) respecting .mailmap, see
+<p>author local-part (see <code>%al</code>) respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%ad</em></dt>
+<dt class="hdlist1"><code>%ad</code></dt>
<dd>
<p>author date (format respects --date= option)</p>
</dd>
-<dt class="hdlist1"><em>%aD</em></dt>
+<dt class="hdlist1"><code>%aD</code></dt>
<dd>
<p>author date, RFC2822 style</p>
</dd>
-<dt class="hdlist1"><em>%ar</em></dt>
+<dt class="hdlist1"><code>%ar</code></dt>
<dd>
<p>author date, relative</p>
</dd>
-<dt class="hdlist1"><em>%at</em></dt>
+<dt class="hdlist1"><code>%at</code></dt>
<dd>
<p>author date, UNIX timestamp</p>
</dd>
-<dt class="hdlist1"><em>%ai</em></dt>
+<dt class="hdlist1"><code>%ai</code></dt>
<dd>
<p>author date, ISO 8601-like format</p>
</dd>
-<dt class="hdlist1"><em>%aI</em></dt>
+<dt class="hdlist1"><code>%aI</code></dt>
<dd>
<p>author date, strict ISO 8601 format</p>
</dd>
-<dt class="hdlist1"><em>%as</em></dt>
+<dt class="hdlist1"><code>%as</code></dt>
<dd>
<p>author date, short format (<code>YYYY-MM-DD</code>)</p>
</dd>
-<dt class="hdlist1"><em>%ah</em></dt>
+<dt class="hdlist1"><code>%ah</code></dt>
<dd>
<p>author date, human style (like the <code>--date=human</code> option of
<a href="git-rev-list.html">git-rev-list(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%cn</em></dt>
+<dt class="hdlist1"><code>%cn</code></dt>
<dd>
<p>committer name</p>
</dd>
-<dt class="hdlist1"><em>%cN</em></dt>
+<dt class="hdlist1"><code>%cN</code></dt>
<dd>
<p>committer name (respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%ce</em></dt>
+<dt class="hdlist1"><code>%ce</code></dt>
<dd>
<p>committer email</p>
</dd>
-<dt class="hdlist1"><em>%cE</em></dt>
+<dt class="hdlist1"><code>%cE</code></dt>
<dd>
<p>committer email (respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%cl</em></dt>
+<dt class="hdlist1"><code>%cl</code></dt>
<dd>
-<p>committer email local-part (the part before the <em>@</em> sign)</p>
+<p>committer email local-part (the part before the <code>@</code> sign)</p>
</dd>
-<dt class="hdlist1"><em>%cL</em></dt>
+<dt class="hdlist1"><code>%cL</code></dt>
<dd>
-<p>committer local-part (see <em>%cl</em>) respecting .mailmap, see
+<p>committer local-part (see <code>%cl</code>) respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%cd</em></dt>
+<dt class="hdlist1"><code>%cd</code></dt>
<dd>
<p>committer date (format respects --date= option)</p>
</dd>
-<dt class="hdlist1"><em>%cD</em></dt>
+<dt class="hdlist1"><code>%cD</code></dt>
<dd>
<p>committer date, RFC2822 style</p>
</dd>
-<dt class="hdlist1"><em>%cr</em></dt>
+<dt class="hdlist1"><code>%cr</code></dt>
<dd>
<p>committer date, relative</p>
</dd>
-<dt class="hdlist1"><em>%ct</em></dt>
+<dt class="hdlist1"><code>%ct</code></dt>
<dd>
<p>committer date, UNIX timestamp</p>
</dd>
-<dt class="hdlist1"><em>%ci</em></dt>
+<dt class="hdlist1"><code>%ci</code></dt>
<dd>
<p>committer date, ISO 8601-like format</p>
</dd>
-<dt class="hdlist1"><em>%cI</em></dt>
+<dt class="hdlist1"><code>%cI</code></dt>
<dd>
<p>committer date, strict ISO 8601 format</p>
</dd>
-<dt class="hdlist1"><em>%cs</em></dt>
+<dt class="hdlist1"><code>%cs</code></dt>
<dd>
<p>committer date, short format (<code>YYYY-MM-DD</code>)</p>
</dd>
-<dt class="hdlist1"><em>%ch</em></dt>
+<dt class="hdlist1"><code>%ch</code></dt>
<dd>
<p>committer date, human style (like the <code>--date=human</code> option of
<a href="git-rev-list.html">git-rev-list(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%d</em></dt>
+<dt class="hdlist1"><code>%d</code></dt>
<dd>
<p>ref names, like the --decorate option of <a href="git-log.html">git-log(1)</a></p>
</dd>
-<dt class="hdlist1"><em>%D</em></dt>
+<dt class="hdlist1"><code>%D</code></dt>
<dd>
<p>ref names without the " (", ")" wrapping.</p>
</dd>
-<dt class="hdlist1"><em>%(decorate[:<options>])</em></dt>
+<dt class="hdlist1"><code>%</code>(<code>decorate</code>[<code>:</code><em><option></em><code>,..</code>.])</dt>
<dd>
<p>ref names with custom decorations. The <code>decorate</code> string may be followed by a
colon and zero or more comma-separated options. Option values may contain
-literal formatting codes. These must be used for commas (%x2C) and closing
-parentheses (%x29), due to their role in the option syntax.</p>
+literal formatting codes. These must be used for commas (<code>%x2C</code>) and closing
+parentheses (<code>%x29</code>), due to their role in the option syntax.</p>
<div class="ulist">
<ul>
<li>
-<p><em>prefix=<value></em>: Shown before the list of ref names. Defaults to " (".</p>
+<p><code>prefix=</code><em><value></em>: Shown before the list of ref names. Defaults to " +(+".</p>
</li>
<li>
-<p><em>suffix=<value></em>: Shown after the list of ref names. Defaults to ")".</p>
+<p><code>suffix=</code><em><value></em>: Shown after the list of ref names. Defaults to ")".</p>
</li>
<li>
-<p><em>separator=<value></em>: Shown between ref names. Defaults to "<code>,</code> ".</p>
+<p><code>separator=</code><em><value></em>: Shown between ref names. Defaults to "<code>,</code> ".</p>
</li>
<li>
-<p><em>pointer=<value></em>: Shown between HEAD and the branch it points to, if any.
-Defaults to " <code>-</code>> ".</p>
+<p><code>pointer=</code><em><value></em>: Shown between HEAD and the branch it points to, if any.
+Defaults to " +→+ ".</p>
</li>
<li>
-<p><em>tag=<value></em>: Shown before tag names. Defaults to "<code>tag:</code> ".</p>
+<p><code>tag=</code><em><value></em>: Shown before tag names. Defaults to "<code>tag:</code> ".</p>
</li>
</ul>
</div>
@@ -2113,11 +2126,11 @@
</div>
<div class="paragraph">
<p>+
-%(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p>
+<code>%</code>(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p>
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1"><em>%(describe[:<options>])</em></dt>
+<dt class="hdlist1"><code>%</code>(<code>describe</code>[<code>:</code><em><option></em><code>,..</code>.])</dt>
<dd>
<p>human-readable name, like <a href="git-describe.html">git-describe(1)</a>; empty string for
undescribable commits. The <code>describe</code> string may be followed by a colon and
@@ -2126,60 +2139,60 @@
<div class="ulist">
<ul>
<li>
-<p><em>tags[=<bool-value>]</em>: Instead of only considering annotated tags,
+<p><code>tags</code>[<code>=</code><em><bool-value></em>]: Instead of only considering annotated tags,
consider lightweight tags as well.</p>
</li>
<li>
-<p><em>abbrev=<number></em>: Instead of using the default number of hexadecimal digits
+<p><code>abbrev=</code><em><number></em>: Instead of using the default number of hexadecimal digits
(which will vary according to the number of objects in the repository with a
default of 7) of the abbreviated object name, use <number> digits, or as many
digits as needed to form a unique object name.</p>
</li>
<li>
-<p><em>match=<pattern></em>: Only consider tags matching the given
-<code>glob</code>(<code>7</code>) pattern, excluding the "refs/tags/" prefix.</p>
+<p><code>match=</code><em><pattern></em>: Only consider tags matching the given
+<code>glob</code>(<code>7</code>) <em><pattern></em>, excluding the <code>refs/tags/</code> prefix.</p>
</li>
<li>
-<p><em>exclude=<pattern></em>: Do not consider tags matching the given
-<code>glob</code>(<code>7</code>) pattern, excluding the "refs/tags/" prefix.</p>
+<p><code>exclude=</code><em><pattern></em>: Do not consider tags matching the given
+<code>glob</code>(<code>7</code>) <em><pattern></em>, excluding the <code>refs/tags/</code> prefix.</p>
</li>
</ul>
</div>
</dd>
-<dt class="hdlist1"><em>%S</em></dt>
+<dt class="hdlist1"><code>%S</code></dt>
<dd>
<p>ref name given on the command line by which the commit was reached
(like <code>git</code> <code>log</code> <code>--source</code>), only works with <code>git</code> <code>log</code></p>
</dd>
-<dt class="hdlist1"><em>%e</em></dt>
+<dt class="hdlist1"><code>%e</code></dt>
<dd>
<p>encoding</p>
</dd>
-<dt class="hdlist1"><em>%s</em></dt>
+<dt class="hdlist1"><code>%s</code></dt>
<dd>
<p>subject</p>
</dd>
-<dt class="hdlist1"><em>%f</em></dt>
+<dt class="hdlist1"><code>%f</code></dt>
<dd>
<p>sanitized subject line, suitable for a filename</p>
</dd>
-<dt class="hdlist1"><em>%b</em></dt>
+<dt class="hdlist1"><code>%b</code></dt>
<dd>
<p>body</p>
</dd>
-<dt class="hdlist1"><em>%B</em></dt>
+<dt class="hdlist1"><code>%B</code></dt>
<dd>
<p>raw body (unwrapped subject and body)</p>
</dd>
-<dt class="hdlist1"><em>%N</em></dt>
+<dt class="hdlist1"><code>%N</code></dt>
<dd>
<p>commit notes</p>
</dd>
-<dt class="hdlist1"><em>%GG</em></dt>
+<dt class="hdlist1"><code>%GG</code></dt>
<dd>
<p>raw verification message from GPG for a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%G?</em></dt>
+<dt class="hdlist1"><code>%G</code>?</dt>
<dd>
<p>show "G" for a good (valid) signature,
"B" for a bad signature,
@@ -2190,28 +2203,28 @@
"E" if the signature cannot be checked (e.g. missing key)
and "N" for no signature</p>
</dd>
-<dt class="hdlist1"><em>%GS</em></dt>
+<dt class="hdlist1"><code>%GS</code></dt>
<dd>
<p>show the name of the signer for a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%GK</em></dt>
+<dt class="hdlist1"><code>%GK</code></dt>
<dd>
<p>show the key used to sign a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%GF</em></dt>
+<dt class="hdlist1"><code>%GF</code></dt>
<dd>
<p>show the fingerprint of the key used to sign a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%GP</em></dt>
+<dt class="hdlist1"><code>%GP</code></dt>
<dd>
<p>show the fingerprint of the primary key whose subkey was used
to sign a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%GT</em></dt>
+<dt class="hdlist1"><code>%GT</code></dt>
<dd>
<p>show the trust level for the key used to sign a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%gD</em></dt>
+<dt class="hdlist1"><code>%gD</code></dt>
<dd>
<p>reflog selector, e.g., <code>refs/stash@</code>{1} or <code>refs/stash@</code>{2
<code>minutes</code> <code>ago</code>}; the format follows the rules described for the
@@ -2219,35 +2232,35 @@
given on the command line (so <code>git</code> <code>log</code> <code>-g</code> <code>refs/heads/master</code>
would yield <code>refs/heads/master@</code>{0}).</p>
</dd>
-<dt class="hdlist1"><em>%gd</em></dt>
+<dt class="hdlist1"><code>%gd</code></dt>
<dd>
-<p>shortened reflog selector; same as %gD, but the refname
+<p>shortened reflog selector; same as <code>%gD</code>, but the refname
portion is shortened for human readability (so
<code>refs/heads/master</code> becomes just <code>master</code>).</p>
</dd>
-<dt class="hdlist1"><em>%gn</em></dt>
+<dt class="hdlist1"><code>%gn</code></dt>
<dd>
<p>reflog identity name</p>
</dd>
-<dt class="hdlist1"><em>%gN</em></dt>
+<dt class="hdlist1"><code>%gN</code></dt>
<dd>
<p>reflog identity name (respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%ge</em></dt>
+<dt class="hdlist1"><code>%ge</code></dt>
<dd>
<p>reflog identity email</p>
</dd>
-<dt class="hdlist1"><em>%gE</em></dt>
+<dt class="hdlist1"><code>%gE</code></dt>
<dd>
<p>reflog identity email (respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%gs</em></dt>
+<dt class="hdlist1"><code>%gs</code></dt>
<dd>
<p>reflog subject</p>
</dd>
-<dt class="hdlist1"><em>%(trailers[:<options>])</em></dt>
+<dt class="hdlist1"><code>%</code>(<code>trailers</code>[<code>:</code><em><option></em><code>,..</code>.])</dt>
<dd>
<p>display the trailers of the body as interpreted by
<a href="git-interpret-trailers.html">git-interpret-trailers(1)</a>. The <code>trailers</code> string may be followed by
@@ -2256,43 +2269,43 @@
<div class="ulist">
<ul>
<li>
-<p><em>key=<key></em>: only show trailers with specified <key>. Matching is done
+<p><code>key=</code><em><key></em>: only show trailers with specified <key>. Matching is done
case-insensitively and trailing colon is optional. If option is
given multiple times trailer lines matching any of the keys are
shown. This option automatically enables the <code>only</code> option so that
non-trailer lines in the trailer block are hidden. If that is not
desired it can be disabled with <code>only=false</code>. E.g.,
-%(<code>trailers:key=Reviewed-by</code>) shows trailer lines with key
+<code>%</code>(<code>trailers:key=Reviewed-by</code>) shows trailer lines with key
<code>Reviewed-by</code>.</p>
</li>
<li>
-<p><em>only[=<bool>]</em>: select whether non-trailer lines from the trailer
+<p><code>only</code>[<code>=</code><em><bool></em>]: select whether non-trailer lines from the trailer
block should be included.</p>
</li>
<li>
-<p><em>separator=<sep></em>: specify the separator inserted between trailer
+<p><code>separator=</code><em><sep></em>: specify the separator inserted between trailer
lines. Defaults to a line feed character. The string <sep> may contain
the literal formatting codes described above. To use comma as
-separator one must use %x2C as it would otherwise be parsed as
-next option. E.g., %(<code>trailers:key=Ticket,separator=</code>%x2C )
+separator one must use <code>%x2C</code> as it would otherwise be parsed as
+next option. E.g., <code>%</code>(<code>trailers:key=Ticket,separator=%x2C</code> )
shows all trailer lines whose key is "Ticket" separated by a comma
and a space.</p>
</li>
<li>
-<p><em>unfold[=<bool>]</em>: make it behave as if interpret-trailer’s <code>--unfold</code>
+<p><code>unfold</code>[<code>=</code><em><bool></em>]: make it behave as if interpret-trailer’s <code>--unfold</code>
option was given. E.g.,
-%(<code>trailers:only,unfold=true</code>) unfolds and shows all trailer lines.</p>
+<code>%</code>(<code>trailers:only,unfold=true</code>) unfolds and shows all trailer lines.</p>
</li>
<li>
-<p><em>keyonly[=<bool>]</em>: only show the key part of the trailer.</p>
+<p><code>keyonly</code>[<code>=</code><em><bool></em>]: only show the key part of the trailer.</p>
</li>
<li>
-<p><em>valueonly[=<bool>]</em>: only show the value part of the trailer.</p>
+<p><code>valueonly</code>[<code>=</code><em><bool></em>]: only show the value part of the trailer.</p>
</li>
<li>
-<p><em>key_value_separator=<sep></em>: specify the separator inserted between
+<p><code>key_value_separator=</code><em><sep></em>: specify the separator inserted between
the key and value of each trailer. Defaults to ": ". Otherwise it
-shares the same semantics as <em>separator=<sep></em> above.</p>
+shares the same semantics as <code>separator=</code><em><sep></em> above.</p>
</li>
</ul>
</div>
@@ -2310,9 +2323,9 @@
</td>
<td class="content">
Some placeholders may depend on other options given to the
-revision traversal engine. For example, the %g* reflog options will
+revision traversal engine. For example, the <code>%g*</code> reflog options will
insert an empty string unless we are traversing reflog entries (e.g., by
-<code>git</code> <code>log</code> <code>-g</code>). The %d and %D placeholders will use the "short"
+<code>git</code> <code>log</code> <code>-g</code>). The <code>%d</code> and <code>%D</code> placeholders will use the "short"
decoration format if <code>--decorate</code> was not already provided on the command
line.
</td>
@@ -2321,31 +2334,31 @@
</div>
<div class="paragraph">
<p>The boolean options accept an optional value [<code>=</code><em><bool-value></em>]. The
-values taken by <code>--type=bool</code> git-config[1], like <code>yes</code> and <code>off</code>,
+values taken by <code>--type=bool</code> <a href="git-config.html">git-config(1)</a>, like <code>yes</code> and <code>off</code>,
are all accepted. Giving a boolean option without <code>=</code><em><value></em> is
equivalent to giving it with <code>=true</code>.</p>
</div>
<div class="paragraph">
-<p>If you add a <code>+</code> (plus sign) after <em>%</em> of a placeholder, a line-feed
+<p>If you add a <code>+</code> (plus sign) after <code>%</code> of a placeholder, a line-feed
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.</p>
</div>
<div class="paragraph">
-<p>If you add a <code>-</code> (minus sign) after <em>%</em> of a placeholder, all consecutive
+<p>If you add a <code>-</code> (minus sign) after <code>%</code> of a placeholder, all consecutive
line-feeds immediately preceding the expansion are deleted if and only if the
placeholder expands to an empty string.</p>
</div>
<div class="paragraph">
-<p>If you add a ` ` (space) after <em>%</em> of a placeholder, a space
+<p>If you add a ' ' (space) after <code>%</code> of a placeholder, a space
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.</p>
</div>
<div class="ulist">
<ul>
<li>
-<p><em>tformat:</em></p>
+<p><code>tformat:</code></p>
<div class="paragraph">
-<p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
+<p>The <code>tformat:</code> format works exactly like <code>format:</code>, except that it
provides "terminator" semantics instead of "separator" semantics. In
other words, each commit has the message terminator character (usually a
newline) appended, rather than a separator placed between entries.
@@ -2367,7 +2380,7 @@
</div>
</div>
<div class="paragraph">
-<p>In addition, any unrecognized string that has a % in it is interpreted
+<p>In addition, any unrecognized string that has a <code>%</code> in it is interpreted
as if it has <code>tformat:</code> in front of it. For example, these two are
equivalent:</p>
</div>
@@ -2991,7 +3004,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/git-diff.html b/git-diff.html
index 34e240e..1e1bd6f 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -1120,7 +1120,7 @@
few lines that happen to match textually as the context, but as a
single deletion of everything old followed by a single insertion of
everything new, and the number <em><m></em> controls this aspect of the <code>-B</code>
-option (defaults to 60%). <code>-B/70</code>% specifies that less than 30% of the
+option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
original should remain in the result for Git to consider it a total
rewrite (i.e. otherwise the resulting patch will be a series of
deletion and insertion mixed together with context lines).</p>
@@ -1129,7 +1129,7 @@
<p>When used with <code>-M</code>, a totally-rewritten file is also considered as the
source of a rename (usually <code>-M</code> only considers a file that disappeared
as the source of a rename), and the number <em><n></em> controls this aspect of
-the <code>-B</code> option (defaults to 50%). <code>-B20</code>% specifies that a change with
+the <code>-B</code> option (defaults to 50%). <code>-B20%</code> specifies that a change with
addition and deletion compared to 20% or more of the file’s size are
eligible for being picked up as a possible source of a rename to
another file.</p>
@@ -1141,13 +1141,13 @@
<p>Detect renames.
If <em><n></em> is specified, it is a threshold on the similarity
index (i.e. amount of addition/deletions compared to the
-file’s size). For example, <code>-M90</code>% means Git should consider a
+file’s size). For example, <code>-M90%</code> means Git should consider a
delete/add pair to be a rename if more than 90% of the file
-hasn’t changed. Without a % sign, the number is to be read as
+hasn’t changed. Without a <code>%</code> sign, the number is to be read as
a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
-0.5, and is thus the same as <code>-M50</code>%. Similarly, <code>-M05</code> is
-the same as <code>-M5</code>%. To limit detection to exact renames, use
-<code>-M100</code>%. The default similarity index is 50%.</p>
+0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is
+the same as <code>-M5%</code>. To limit detection to exact renames, use
+<code>-M100%</code>. The default similarity index is 50%.</p>
</dd>
<dt class="hdlist1"><code>-C</code>[<em><n></em>]</dt>
<dt class="hdlist1"><code>--find-copies</code>[<code>=</code><em><n></em>]</dt>
@@ -2644,7 +2644,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-06-18 14:54:41 -0700
+Last updated 2025-06-24 11:24:02 -0700
</div>
</div>
</body>
diff --git a/git-for-each-ref.html b/git-for-each-ref.html
index 0698fef..04c3492 100644
--- a/git-for-each-ref.html
+++ b/git-for-each-ref.html
@@ -508,14 +508,14 @@
</dd>
<dt class="hdlist1">--format=<format></dt>
<dd>
-<p>A string that interpolates %(<code>fieldname</code>) from a ref being shown and
-the object it points at. In addition, the string literal %%
-renders as % and %xx - where <code>xx</code> are hex digits - renders as
-the character with hex code <code>xx</code>. For example, %00 interpolates to
-<code>\0</code> (NUL), %09 to <code>\t</code> (TAB), and %0a to <code>\n</code> (LF).</p>
+<p>A string that interpolates <code>%</code>(<code>fieldname</code>) from a ref being shown and
+the object it points at. In addition, the string literal <code>%%</code>
+renders as <code>%</code> and <code>%xx</code> - where <code>xx</code> are hex digits - renders as
+the character with hex code <code>xx</code>. For example, <code>%00</code> interpolates to
+<code>\0</code> (NUL), <code>%09</code> to <code>\t</code> (TAB), and <code>%0a</code> to <code>\n</code> (LF).</p>
<div class="paragraph">
-<p>When unspecified, <em><format></em> defaults to %(<code>objectname</code>) <code>SPC</code> %(<code>objecttype</code>)
-<code>TAB</code> %(<code>refname</code>).</p>
+<p>When unspecified, <em><format></em> defaults to <code>%</code>(<code>objectname</code>) <code>SPC</code> <code>%</code>(<code>objecttype</code>)
+<code>TAB</code> <code>%</code>(<code>refname</code>).</p>
</div>
</dd>
<dt class="hdlist1">--color[=<when>]</dt>
@@ -529,7 +529,7 @@
<dt class="hdlist1">--python</dt>
<dt class="hdlist1">--tcl</dt>
<dd>
-<p>If given, strings that substitute %(<code>fieldname</code>)
+<p>If given, strings that substitute <code>%</code>(<code>fieldname</code>)
placeholders are quoted as string literals suitable for
the specified host language. This is meant to produce
a scriptlet that can directly be `eval`ed.</p>
@@ -601,12 +601,12 @@
The option core.warnAmbiguousRefs is used to select the strict
abbreviation mode. If <code>lstrip=</code><em><N></em> (<code>rstrip=</code><em><N></em>) is appended, strips <em><N></em>
slash-separated path components from the front (back) of the refname
-(e.g. %(<code>refname:lstrip=2</code>) turns <code>refs/tags/foo</code> into <code>foo</code> and
-%(<code>refname:rstrip=2</code>) turns <code>refs/tags/foo</code> into <code>refs</code>).
+(e.g. <code>%</code>(<code>refname:lstrip=2</code>) turns <code>refs/tags/foo</code> into <code>foo</code> and
+<code>%</code>(<code>refname:rstrip=2</code>) turns <code>refs/tags/foo</code> into <code>refs</code>).
If <em><N></em> is a negative number, strip as many path components as
necessary from the specified end to leave <code>-</code><em><N></em> path components
-(e.g. %(<code>refname:lstrip=-2</code>) turns
-<code>refs/tags/foo</code> into <code>tags/foo</code> and %(<code>refname:rstrip=-1</code>)
+(e.g. <code>%</code>(<code>refname:lstrip=-2</code>) turns
+<code>refs/tags/foo</code> into <code>tags/foo</code> and <code>%</code>(<code>refname:rstrip=-1</code>)
turns <code>refs/tags/foo</code> into <code>refs</code>). When the ref does not have
enough components, the result becomes an empty string if
stripping with positive <N>, or it becomes the full refname if
@@ -651,12 +651,12 @@
encountered. Append <code>:track,nobracket</code> to show tracking
information without brackets (i.e "ahead N, behind M").</p>
<div class="paragraph">
-<p>For any remote-tracking branch %(<code>upstream</code>), %(<code>upstream:remotename</code>)
-and %(<code>upstream:remoteref</code>) refer to the name of the remote and the
+<p>For any remote-tracking branch <code>%</code>(<code>upstream</code>), <code>%</code>(<code>upstream:remotename</code>)
+and <code>%</code>(<code>upstream:remoteref</code>) refer to the name of the remote and the
name of the tracked remote ref, respectively. In other words, the
remote-tracking branch can be updated explicitly and individually by
-using the refspec %(<code>upstream:remoteref</code>)<code>:</code>%(<code>upstream</code>) to fetch from
-%(<code>upstream:remotename</code>).</p>
+using the refspec <code>%</code>(<code>upstream:remoteref</code>)<code>:%</code>(<code>upstream</code>) to fetch from
+<code>%</code>(<code>upstream:remotename</code>).</p>
</div>
<div class="paragraph">
<p>Has no effect if the ref does not have tracking information associated
@@ -682,7 +682,7 @@
<p>Change output color. Followed by <code>:</code><em><colorname></em>, where color
names are described under Values in the "CONFIGURATION FILE"
section of <a href="git-config.html">git-config(1)</a>. For example,
-%(<code>color:bold</code> <code>red</code>).</p>
+<code>%</code>(<code>color:bold</code> <code>red</code>).</p>
</dd>
<dt class="hdlist1">align</dt>
<dd>
@@ -694,7 +694,7 @@
length of the content with alignment. For brevity, the
"width=" and/or "position=" prefixes may be omitted, and bare
<width> and <position> used instead. For instance,
-%(<code>align:</code><em><width></em><code>,</code><em><position></em>). If the contents length is more
+<code>%</code>(<code>align:</code><em><width></em><code>,</code><em><position></em>). If the contents length is more
than the width then no alignment is performed. If used with
<code>--quote</code> everything in between %(align:…​) and %(end) is
quoted, but if nested then only the topmost level performs
@@ -795,7 +795,7 @@
</div>
<div class="paragraph">
<p>Here, if <code>A</code>, <code>B</code>, and <code>C</code> are the filtered references, and the format
-string is %(<code>refname</code>)<code>:</code>%(<code>is-base:D</code>), then the output would be</p>
+string is <code>%</code>(<code>refname</code>)<code>:%</code>(<code>is-base:D</code>), then the output would be</p>
</div>
<div class="listingblock">
<div class="content">
@@ -897,7 +897,7 @@
</dl>
</div>
<div class="paragraph">
-<p>Note that <code>--format=</code>%(<code>raw</code>) can not be used with <code>--python</code>, <code>--shell</code>, <code>--tcl</code>,
+<p>Note that <code>--format=%</code>(<code>raw</code>) can not be used with <code>--python</code>, <code>--shell</code>, <code>--tcl</code>,
because such language may not support arbitrary binary data in their string
variable type.</p>
</div>
@@ -1138,7 +1138,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-03-26 00:41:02 -0700
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/git-format-patch.html b/git-format-patch.html
index 3396191..d78ba96 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -832,7 +832,7 @@
few lines that happen to match textually as the context, but as a
single deletion of everything old followed by a single insertion of
everything new, and the number <em><m></em> controls this aspect of the <code>-B</code>
-option (defaults to 60%). <code>-B/70</code>% specifies that less than 30% of the
+option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
original should remain in the result for Git to consider it a total
rewrite (i.e. otherwise the resulting patch will be a series of
deletion and insertion mixed together with context lines).</p>
@@ -841,7 +841,7 @@
<p>When used with <code>-M</code>, a totally-rewritten file is also considered as the
source of a rename (usually <code>-M</code> only considers a file that disappeared
as the source of a rename), and the number <em><n></em> controls this aspect of
-the <code>-B</code> option (defaults to 50%). <code>-B20</code>% specifies that a change with
+the <code>-B</code> option (defaults to 50%). <code>-B20%</code> specifies that a change with
addition and deletion compared to 20% or more of the file’s size are
eligible for being picked up as a possible source of a rename to
another file.</p>
@@ -853,13 +853,13 @@
<p>Detect renames.
If <em><n></em> is specified, it is a threshold on the similarity
index (i.e. amount of addition/deletions compared to the
-file’s size). For example, <code>-M90</code>% means Git should consider a
+file’s size). For example, <code>-M90%</code> means Git should consider a
delete/add pair to be a rename if more than 90% of the file
-hasn’t changed. Without a % sign, the number is to be read as
+hasn’t changed. Without a <code>%</code> sign, the number is to be read as
a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
-0.5, and is thus the same as <code>-M50</code>%. Similarly, <code>-M05</code> is
-the same as <code>-M5</code>%. To limit detection to exact renames, use
-<code>-M100</code>%. The default similarity index is 50%.</p>
+0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is
+the same as <code>-M5%</code>. To limit detection to exact renames, use
+<code>-M100%</code>. The default similarity index is 50%.</p>
</dd>
<dt class="hdlist1"><code>-C</code>[<em><n></em>]</dt>
<dt class="hdlist1"><code>--find-copies</code>[<code>=</code><em><n></em>]</dt>
@@ -1987,7 +1987,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/git-log.adoc b/git-log.adoc
index ae8a7e2..b6f3d92 100644
--- a/git-log.adoc
+++ b/git-log.adoc
@@ -8,8 +8,8 @@
SYNOPSIS
--------
-[verse]
-'git log' [<options>] [<revision-range>] [[--] <path>...]
+[synopsis]
+git log [<options>] [<revision-range>] [[--] <path>...]
DESCRIPTION
-----------
@@ -27,28 +27,34 @@
OPTIONS
-------
---follow::
+`--follow`::
Continue listing the history of a file beyond renames
(works only for a single file).
---no-decorate::
---decorate[=short|full|auto|no]::
- Print out the ref names of any commits that are shown. If 'short' is
- specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and
- 'refs/remotes/' will not be printed. If 'full' is specified, the
- full ref name (including prefix) will be printed. If 'auto' is
- specified, then if the output is going to a terminal, the ref names
- are shown as if 'short' were given, otherwise no ref names are
- shown. The option `--decorate` is short-hand for `--decorate=short`.
- Default to configuration value of `log.decorate` if configured,
- otherwise, `auto`.
+`--no-decorate`::
+`--decorate[=(short|full|auto|no)]`::
+ Print out the ref names of any commits that are shown. Possible values
+ are:
++
+----
+`short`;; the ref name prefixes `refs/heads/`, `refs/tags/` and
+ `refs/remotes/` are not printed.
+`full`;; the full ref name (including prefix) is printed.
+`auto`:: if the output is going to a terminal, the ref names
+ are shown as if `short` were given, otherwise no ref names are
+ shown.
+----
++
+The option `--decorate` is short-hand for `--decorate=short`. Default to
+configuration value of `log.decorate` if configured, otherwise, `auto`.
---decorate-refs=<pattern>::
---decorate-refs-exclude=<pattern>::
+`--decorate-refs=<pattern>`::
+`--decorate-refs-exclude=<pattern>`::
For each candidate reference, do not use it for decoration if it
- matches any patterns given to `--decorate-refs-exclude` or if it
- doesn't match any of the patterns given to `--decorate-refs`. The
- `log.excludeDecoration` config option allows excluding refs from
+ matches any of the _<pattern>_ parameters given to
+ `--decorate-refs-exclude` or if it doesn't match any of the
+ _<pattern>_ parameters given to `--decorate-refs`.
+ The `log.excludeDecoration` config option allows excluding refs from
the decorations, but an explicit `--decorate-refs` pattern will
override a match in `log.excludeDecoration`.
+
@@ -56,51 +62,51 @@
used as decoration if they match `HEAD`, `refs/heads/`, `refs/remotes/`,
`refs/stash/`, or `refs/tags/`.
---clear-decorations::
+`--clear-decorations`::
When specified, this option clears all previous `--decorate-refs`
or `--decorate-refs-exclude` options and relaxes the default
decoration filter to include all references. This option is
assumed if the config value `log.initialDecorationSet` is set to
`all`.
---source::
+`--source`::
Print out the ref name given on the command line by which each
commit was reached.
---[no-]mailmap::
---[no-]use-mailmap::
+`--[no-]mailmap`::
+`--[no-]use-mailmap`::
Use mailmap file to map author and committer names and email
addresses to canonical real names and email addresses. See
linkgit:git-shortlog[1].
---full-diff::
+`--full-diff`::
Without this flag, `git log -p <path>...` shows commits that
touch the specified paths, and diffs about the same specified
paths. With this, the full diff is shown for commits that touch
- the specified paths; this means that "<path>..." limits only
+ the specified paths; this means that "`<path>...`" limits only
commits, and doesn't limit diff for those commits.
+
Note that this affects all diff-based output types, e.g. those
produced by `--stat`, etc.
---log-size::
- Include a line ``log size <number>'' in the output for each commit,
- where <number> is the length of that commit's message in bytes.
+`--log-size`::
+ Include a line `log size <number>` in the output for each commit,
+ where _<number>_ is the length of that commit's message in bytes.
Intended to speed up tools that read log messages from `git log`
output by allowing them to allocate space in advance.
include::line-range-options.adoc[]
-<revision-range>::
+_<revision-range>_::
Show only commits in the specified revision range. When no
- <revision-range> is specified, it defaults to `HEAD` (i.e. the
+ _<revision-range>_ is specified, it defaults to `HEAD` (i.e. the
whole history leading to the current commit). `origin..HEAD`
specifies all the commits reachable from the current commit
(i.e. `HEAD`), but not from `origin`. For a complete list of
- ways to spell <revision-range>, see the 'Specifying Ranges'
+ ways to spell _<revision-range>_, see the 'Specifying Ranges'
section of linkgit:gitrevisions[7].
-[--] <path>...::
+`[--] <path>...`::
Show only commits that are enough to explain how the files
that match the specified paths came to be. See 'History
Simplification' below for details and other simplification
@@ -145,14 +151,14 @@
`git log --since="2 weeks ago" -- gitk`::
- Show the changes during the last two weeks to the file 'gitk'.
+ Show the changes during the last two weeks to the file `gitk`.
The `--` is necessary to avoid confusion with the *branch* named
- 'gitk'
+ `gitk`
`git log --name-status release..test`::
- Show the commits that are in the "test" branch but not yet
- in the "release" branch, along with the list of paths
+ Show the commits that are in the "`test`" branch but not yet
+ in the "`release`" branch, along with the list of paths
each commit modifies.
`git log --follow builtin/rev-list.c`::
@@ -164,7 +170,7 @@
`git log --branches --not --remotes=origin`::
Shows all commits that are in any of local branches but not in
- any of remote-tracking branches for 'origin' (what you have that
+ any of remote-tracking branches for `origin` (what you have that
origin doesn't).
`git log master --not --remotes=*/master`::
@@ -200,11 +206,11 @@
See linkgit:git-config[1] for core variables and linkgit:git-diff[1]
for settings related to diff generation.
-format.pretty::
+`format.pretty`::
Default for the `--format` option. (See 'Pretty Formats' above.)
Defaults to `medium`.
-i18n.logOutputEncoding::
+`i18n.logOutputEncoding`::
Encoding to use when displaying logs. (See 'Discussion' above.)
Defaults to the value of `i18n.commitEncoding` if set, and UTF-8
otherwise.
diff --git a/git-log.html b/git-log.html
index 1367001..e1e739f 100644
--- a/git-log.html
+++ b/git-log.html
@@ -452,7 +452,7 @@
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git log</em> [<options>] [<revision-range>] [[--] <path>…​]</pre>
+<pre class="content"><code>git</code> <code>log</code> [<em><options></em>] [<em><revision-range></em>] [[<code>--</code>] <em><path></em>…​]</pre>
</div>
</div>
</div>
@@ -489,8 +489,8 @@
not from <em>baz</em>".</p>
</div>
<div class="paragraph">
-<p>A special notation "<em><commit1></em>..<em><commit2></em>" can be used as a
-short-hand for "^<em><commit1></em> <em><commit2></em>". For example, either of
+<p>A special notation "<em><commit1></em><code>..</code><em><commit2></em>" can be used as a
+short-hand for "<code>^</code><em><commit1></em> <em><commit2></em>". For example, either of
the following may be used interchangeably:</p>
</div>
<div class="listingblock">
@@ -500,7 +500,7 @@
</div>
</div>
<div class="paragraph">
-<p>Another special notation is "<em><commit1></em>…​<em><commit2></em>" which is useful
+<p>Another special notation is "<em><commit1></em><code>...</code><em><commit2></em>" which is useful
for merges. The resulting set of commits is the symmetric difference
between the two operands. The following two commands are equivalent:</p>
</div>
@@ -523,31 +523,39 @@
<div class="sectionbody">
<div class="dlist">
<dl>
-<dt class="hdlist1">--follow</dt>
+<dt class="hdlist1"><code>--follow</code></dt>
<dd>
<p>Continue listing the history of a file beyond renames
(works only for a single file).</p>
</dd>
-<dt class="hdlist1">--no-decorate</dt>
-<dt class="hdlist1">--decorate[=short|full|auto|no]</dt>
+<dt class="hdlist1"><code>--no-decorate</code></dt>
+<dt class="hdlist1"><code>--decorate</code>[<code>=</code>(<code>short</code>|<code>full</code>|<code>auto</code>|<code>no</code>)]</dt>
<dd>
-<p>Print out the ref names of any commits that are shown. If <em>short</em> is
-specified, the ref name prefixes <em>refs/heads/</em>, <em>refs/tags/</em> and
-<em>refs/remotes/</em> will not be printed. If <em>full</em> is specified, the
-full ref name (including prefix) will be printed. If <em>auto</em> is
-specified, then if the output is going to a terminal, the ref names
-are shown as if <em>short</em> were given, otherwise no ref names are
-shown. The option <code>--decorate</code> is short-hand for <code>--decorate=short</code>.
-Default to configuration value of <code>log.decorate</code> if configured,
-otherwise, <code>auto</code>.</p>
+<p>Print out the ref names of any commits that are shown. Possible values
+are:</p>
+<div class="listingblock">
+<div class="content">
+<pre>`short`;; the ref name prefixes `refs/heads/`, `refs/tags/` and
+ `refs/remotes/` are not printed.
+`full`;; the full ref name (including prefix) is printed.
+`auto`:: if the output is going to a terminal, the ref names
+ are shown as if `short` were given, otherwise no ref names are
+ shown.</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The option <code>--decorate</code> is short-hand for <code>--decorate=short</code>. Default to
+configuration value of <code>log.decorate</code> if configured, otherwise, <code>auto</code>.</p>
+</div>
</dd>
-<dt class="hdlist1">--decorate-refs=<pattern></dt>
-<dt class="hdlist1">--decorate-refs-exclude=<pattern></dt>
+<dt class="hdlist1"><code>--decorate-refs=</code><em><pattern></em></dt>
+<dt class="hdlist1"><code>--decorate-refs-exclude=</code><em><pattern></em></dt>
<dd>
<p>For each candidate reference, do not use it for decoration if it
-matches any patterns given to <code>--decorate-refs-exclude</code> or if it
-doesn’t match any of the patterns given to <code>--decorate-refs</code>. The
-<code>log.excludeDecoration</code> config option allows excluding refs from
+matches any of the <em><pattern></em> parameters given to
+<code>--decorate-refs-exclude</code> or if it doesn’t match any of the
+<em><pattern></em> parameters given to <code>--decorate-refs</code>.
+The <code>log.excludeDecoration</code> config option allows excluding refs from
the decorations, but an explicit <code>--decorate-refs</code> pattern will
override a match in <code>log.excludeDecoration</code>.</p>
<div class="paragraph">
@@ -556,7 +564,7 @@
<code>refs/stash/</code>, or <code>refs/tags/</code>.</p>
</div>
</dd>
-<dt class="hdlist1">--clear-decorations</dt>
+<dt class="hdlist1"><code>--clear-decorations</code></dt>
<dd>
<p>When specified, this option clears all previous <code>--decorate-refs</code>
or <code>--decorate-refs-exclude</code> options and relaxes the default
@@ -564,41 +572,41 @@
assumed if the config value <code>log.initialDecorationSet</code> is set to
<code>all</code>.</p>
</dd>
-<dt class="hdlist1">--source</dt>
+<dt class="hdlist1"><code>--source</code></dt>
<dd>
<p>Print out the ref name given on the command line by which each
commit was reached.</p>
</dd>
-<dt class="hdlist1">--[no-]mailmap</dt>
-<dt class="hdlist1">--[no-]use-mailmap</dt>
+<dt class="hdlist1"><code>--</code>[<code>no-</code>]<code>mailmap</code></dt>
+<dt class="hdlist1"><code>--</code>[<code>no-</code>]<code>use-mailmap</code></dt>
<dd>
<p>Use mailmap file to map author and committer names and email
addresses to canonical real names and email addresses. See
<a href="git-shortlog.html">git-shortlog(1)</a>.</p>
</dd>
-<dt class="hdlist1">--full-diff</dt>
+<dt class="hdlist1"><code>--full-diff</code></dt>
<dd>
<p>Without this flag, <code>git</code> <code>log</code> <code>-p</code> <em><path></em>... shows commits that
touch the specified paths, and diffs about the same specified
paths. With this, the full diff is shown for commits that touch
-the specified paths; this means that "<path>…​" limits only
+the specified paths; this means that "<em><path></em>..." limits only
commits, and doesn’t limit diff for those commits.</p>
<div class="paragraph">
<p>Note that this affects all diff-based output types, e.g. those
produced by <code>--stat</code>, etc.</p>
</div>
</dd>
-<dt class="hdlist1">--log-size</dt>
+<dt class="hdlist1"><code>--log-size</code></dt>
<dd>
-<p>Include a line “log size <number>” in the output for each commit,
-where <number> is the length of that commit’s message in bytes.
+<p>Include a line <code>log</code> <code>size</code> <em><number></em> in the output for each commit,
+where <em><number></em> is the length of that commit’s message in bytes.
Intended to speed up tools that read log messages from <code>git</code> <code>log</code>
output by allowing them to allocate space in advance.</p>
</dd>
-<dt class="hdlist1">-L<start>,<end>:<file></dt>
-<dt class="hdlist1">-L:<funcname>:<file></dt>
+<dt class="hdlist1"><code>-L</code><em><start></em><code>,</code><em><end></em><code>:</code><em><file></em></dt>
+<dt class="hdlist1"><code>-L:</code><em><funcname></em><code>:</code><em><file></em></dt>
<dd>
-<p>Trace the evolution of the line range given by <em><start>,<end></em>,
+<p>Trace the evolution of the line range given by <em><start></em><code>,</code><em><end></em>,
or by the function name regex <em><funcname></em>, within the <em><file></em>. You may
not give any pathspec limiters. This is currently limited to
a walk starting from a single revision, i.e., you may only
@@ -614,25 +622,25 @@
<div class="ulist">
<ul>
<li>
-<p>number</p>
+<p><em><number></em></p>
<div class="paragraph">
<p>If <em><start></em> or <em><end></em> is a number, it specifies an
absolute line number (lines count from 1).</p>
</div>
</li>
<li>
-<p><code>/regex/</code></p>
+<p><code>/</code><em><regex></em><code>/</code></p>
<div class="paragraph">
<p>This form will use the first line matching the given
-POSIX regex. If <em><start></em> is a regex, it will search from the end of
+POSIX <em><regex></em>. If <em><start></em> is a regex, it will search from the end of
the previous <code>-L</code> range, if any, otherwise from the start of file.
-If <em><start></em> is <code>^/regex/</code>, it will search from the start of file.
-If <em><end></em> is a regex, it will search
-starting at the line given by <em><start></em>.</p>
+If <em><start></em> is <code>^/</code><em><regex></em><code>/</code>, it will search from the start of file.
+If <em><end></em> is a regex, it will search starting at the line given by
+<em><start></em>.</p>
</div>
</li>
<li>
-<p>+offset or -offset</p>
+<p><code>+</code><em><offset></em> or <code>-</code><em><offset></em></p>
<div class="paragraph">
<p>This is only valid for <em><end></em> and will specify a number
of lines before or after the line given by <em><start></em>.</p>
@@ -651,17 +659,17 @@
in <a href="gitattributes.html">gitattributes(5)</a>).</p>
</div>
</dd>
-<dt class="hdlist1"><revision-range></dt>
+<dt class="hdlist1"><em><revision-range></em></dt>
<dd>
<p>Show only commits in the specified revision range. When no
-<revision-range> is specified, it defaults to <code>HEAD</code> (i.e. the
+<em><revision-range></em> is specified, it defaults to <code>HEAD</code> (i.e. the
whole history leading to the current commit). <code>origin</code><code>..</code><code>HEAD</code>
specifies all the commits reachable from the current commit
(i.e. <code>HEAD</code>), but not from <code>origin</code>. For a complete list of
-ways to spell <revision-range>, see the <em>Specifying Ranges</em>
+ways to spell <em><revision-range></em>, see the <em>Specifying Ranges</em>
section of <a href="gitrevisions.html">gitrevisions(7)</a>.</p>
</dd>
-<dt class="hdlist1">[--] <path>…​</dt>
+<dt class="hdlist1">[<code>--</code>] <em><path></em>...</dt>
<dd>
<p>Show only commits that are enough to explain how the files
that match the specified paths came to be. See <em>History
@@ -693,96 +701,96 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">-<number></dt>
-<dt class="hdlist1">-n <number></dt>
-<dt class="hdlist1">--max-count=<number></dt>
+<dt class="hdlist1"><code>-</code><em><number></em></dt>
+<dt class="hdlist1"><code>-n</code> <em><number></em></dt>
+<dt class="hdlist1"><code>--max-count=</code><em><number></em></dt>
<dd>
-<p>Limit the number of commits to output.</p>
+<p>Limit the output to <em><number></em> commits.</p>
</dd>
-<dt class="hdlist1">--skip=<number></dt>
+<dt class="hdlist1"><code>--skip=</code><em><number></em></dt>
<dd>
-<p>Skip <em>number</em> commits before starting to show the commit output.</p>
+<p>Skip <em><number></em> commits before starting to show the commit output.</p>
</dd>
-<dt class="hdlist1">--since=<date></dt>
-<dt class="hdlist1">--after=<date></dt>
+<dt class="hdlist1"><code>--since=</code><em><date></em></dt>
+<dt class="hdlist1"><code>--after=</code><em><date></em></dt>
<dd>
-<p>Show commits more recent than a specific date.</p>
+<p>Show commits more recent than <em><date></em>.</p>
</dd>
-<dt class="hdlist1">--since-as-filter=<date></dt>
+<dt class="hdlist1"><code>--since-as-filter=</code><em><date></em></dt>
<dd>
-<p>Show all commits more recent than a specific date. This visits
+<p>Show all commits more recent than <em><date></em>. This visits
all commits in the range, rather than stopping at the first commit which
-is older than a specific date.</p>
+is older than <em><date></em>.</p>
</dd>
-<dt class="hdlist1">--until=<date></dt>
-<dt class="hdlist1">--before=<date></dt>
+<dt class="hdlist1"><code>--until=</code><em><date></em></dt>
+<dt class="hdlist1"><code>--before=</code><em><date></em></dt>
<dd>
-<p>Show commits older than a specific date.</p>
+<p>Show commits older than <em><date></em>.</p>
</dd>
-<dt class="hdlist1">--author=<pattern></dt>
-<dt class="hdlist1">--committer=<pattern></dt>
+<dt class="hdlist1"><code>--author=</code><em><pattern></em></dt>
+<dt class="hdlist1"><code>--committer=</code><em><pattern></em></dt>
<dd>
<p>Limit the commits output to ones with author/committer
-header lines that match the specified pattern (regular
-expression). With more than one <code>--author=</code><em><pattern></em>,
-commits whose author matches any of the given patterns are
+header lines that match the <em><pattern></em> regular
+expression. With more than one <code>--author=</code><em><pattern></em>,
+commits whose author matches any of the <em><pattern></em> are
chosen (similarly for multiple <code>--committer=</code><em><pattern></em>).</p>
</dd>
-<dt class="hdlist1">--grep-reflog=<pattern></dt>
+<dt class="hdlist1"><code>--grep-reflog=</code><em><pattern></em></dt>
<dd>
<p>Limit the commits output to ones with reflog entries that
-match the specified pattern (regular expression). With
+match the <em><pattern></em> regular expression. With
more than one <code>--grep-reflog</code>, commits whose reflog message
matches any of the given patterns are chosen. It is an
error to use this option unless <code>--walk-reflogs</code> is in use.</p>
</dd>
-<dt class="hdlist1">--grep=<pattern></dt>
+<dt class="hdlist1"><code>--grep=</code><em><pattern></em></dt>
<dd>
<p>Limit the commits output to ones with a log message that
-matches the specified pattern (regular expression). With
+matches the <em><pattern></em> regular expression. With
more than one <code>--grep=</code><em><pattern></em>, commits whose message
-matches any of the given patterns are chosen (but see
+matches any of the <em><pattern></em> are chosen (but see
<code>--all-match</code>).</p>
<div class="paragraph">
<p>When <code>--notes</code> is in effect, the message from the notes is
matched as if it were part of the log message.</p>
</div>
</dd>
-<dt class="hdlist1">--all-match</dt>
+<dt class="hdlist1"><code>--all-match</code></dt>
<dd>
<p>Limit the commits output to ones that match all given <code>--grep</code>,
instead of ones that match at least one.</p>
</dd>
-<dt class="hdlist1">--invert-grep</dt>
+<dt class="hdlist1"><code>--invert-grep</code></dt>
<dd>
<p>Limit the commits output to ones with a log message that do not
-match the pattern specified with <code>--grep=</code><em><pattern></em>.</p>
+match the <em><pattern></em> specified with <code>--grep=</code><em><pattern></em>.</p>
</dd>
-<dt class="hdlist1">-i</dt>
-<dt class="hdlist1">--regexp-ignore-case</dt>
+<dt class="hdlist1"><code>-i</code></dt>
+<dt class="hdlist1"><code>--regexp-ignore-case</code></dt>
<dd>
<p>Match the regular expression limiting patterns without regard to letter
case.</p>
</dd>
-<dt class="hdlist1">--basic-regexp</dt>
+<dt class="hdlist1"><code>--basic-regexp</code></dt>
<dd>
<p>Consider the limiting patterns to be basic regular expressions;
this is the default.</p>
</dd>
-<dt class="hdlist1">-E</dt>
-<dt class="hdlist1">--extended-regexp</dt>
+<dt class="hdlist1"><code>-E</code></dt>
+<dt class="hdlist1"><code>--extended-regexp</code></dt>
<dd>
<p>Consider the limiting patterns to be extended regular expressions
instead of the default basic regular expressions.</p>
</dd>
-<dt class="hdlist1">-F</dt>
-<dt class="hdlist1">--fixed-strings</dt>
+<dt class="hdlist1"><code>-F</code></dt>
+<dt class="hdlist1"><code>--fixed-strings</code></dt>
<dd>
<p>Consider the limiting patterns to be fixed strings (don’t interpret
pattern as a regular expression).</p>
</dd>
-<dt class="hdlist1">-P</dt>
-<dt class="hdlist1">--perl-regexp</dt>
+<dt class="hdlist1"><code>-P</code></dt>
+<dt class="hdlist1"><code>--perl-regexp</code></dt>
<dd>
<p>Consider the limiting patterns to be Perl-compatible regular
expressions.</p>
@@ -792,23 +800,23 @@
providing this option will cause it to die.</p>
</div>
</dd>
-<dt class="hdlist1">--remove-empty</dt>
+<dt class="hdlist1"><code>--remove-empty</code></dt>
<dd>
<p>Stop when a given path disappears from the tree.</p>
</dd>
-<dt class="hdlist1">--merges</dt>
+<dt class="hdlist1"><code>--merges</code></dt>
<dd>
<p>Print only merge commits. This is exactly the same as <code>--min-parents=2</code>.</p>
</dd>
-<dt class="hdlist1">--no-merges</dt>
+<dt class="hdlist1"><code>--no-merges</code></dt>
<dd>
<p>Do not print commits with more than one parent. This is
exactly the same as <code>--max-parents=1</code>.</p>
</dd>
-<dt class="hdlist1">--min-parents=<number></dt>
-<dt class="hdlist1">--max-parents=<number></dt>
-<dt class="hdlist1">--no-min-parents</dt>
-<dt class="hdlist1">--no-max-parents</dt>
+<dt class="hdlist1"><code>--min-parents=</code><em><number></em></dt>
+<dt class="hdlist1"><code>--max-parents=</code><em><number></em></dt>
+<dt class="hdlist1"><code>--no-min-parents</code></dt>
+<dt class="hdlist1"><code>--no-max-parents</code></dt>
<dd>
<p>Show only commits which have at least (or at most) that many parent
commits. In particular, <code>--max-parents=1</code> is the same as <code>--no-merges</code>,
@@ -820,7 +828,7 @@
parents) and <code>--max-parents=-1</code> (negative numbers denote no upper limit).</p>
</div>
</dd>
-<dt class="hdlist1">--first-parent</dt>
+<dt class="hdlist1"><code>--first-parent</code></dt>
<dd>
<p>When finding commits to include, follow only the first
parent commit upon seeing a merge commit. This option
@@ -835,7 +843,7 @@
to <code>first-parent</code>, see <code>--diff-merges=first-parent</code> for details.</p>
</div>
</dd>
-<dt class="hdlist1">--exclude-first-parent-only</dt>
+<dt class="hdlist1"><code>--exclude-first-parent-only</code></dt>
<dd>
<p>When finding commits to exclude (with a <em>^</em>), follow only
the first parent commit upon seeing a merge commit.
@@ -843,7 +851,7 @@
from the point where it diverged from the remote branch, given
that arbitrary merges can be valid topic branch changes.</p>
</dd>
-<dt class="hdlist1">--not</dt>
+<dt class="hdlist1"><code>--not</code></dt>
<dd>
<p>Reverses the meaning of the <em>^</em> prefix (or lack thereof)
for all following revision specifiers, up to the next <code>--not</code>.
@@ -852,40 +860,40 @@
via standard input, the revisions passed on the command line will
not be affected by it.</p>
</dd>
-<dt class="hdlist1">--all</dt>
+<dt class="hdlist1"><code>--all</code></dt>
<dd>
<p>Pretend as if all the refs in <code>refs/</code>, along with <code>HEAD</code>, are
listed on the command line as <em><commit></em>.</p>
</dd>
-<dt class="hdlist1">--branches[=<pattern>]</dt>
+<dt class="hdlist1"><code>--branches</code>[<code>=</code><em><pattern></em>]</dt>
<dd>
<p>Pretend as if all the refs in <code>refs/heads</code> are listed
on the command line as <em><commit></em>. If <em><pattern></em> is given, limit
-branches to ones matching given shell glob. If pattern lacks <em>?</em>,
+branches to ones matching given shell glob. If <em><pattern></em> lacks <em>?</em>,
<em>*</em>, or <em>[</em>, <em>/*</em> at the end is implied.</p>
</dd>
-<dt class="hdlist1">--tags[=<pattern>]</dt>
+<dt class="hdlist1"><code>--tags</code>[<code>=</code><em><pattern></em>]</dt>
<dd>
<p>Pretend as if all the refs in <code>refs/tags</code> are listed
on the command line as <em><commit></em>. If <em><pattern></em> is given, limit
tags to ones matching given shell glob. If pattern lacks <em>?</em>, <em>*</em>,
or <em>[</em>, <em>/*</em> at the end is implied.</p>
</dd>
-<dt class="hdlist1">--remotes[=<pattern>]</dt>
+<dt class="hdlist1"><code>--remotes</code>[<code>=</code><em><pattern></em>]</dt>
<dd>
<p>Pretend as if all the refs in <code>refs/remotes</code> are listed
on the command line as <em><commit></em>. If <em><pattern></em> is given, limit
remote-tracking branches to ones matching given shell glob.
If pattern lacks <em>?</em>, <em>*</em>, or <em>[</em>, <em>/*</em> at the end is implied.</p>
</dd>
-<dt class="hdlist1">--glob=<glob-pattern></dt>
+<dt class="hdlist1"><code>--glob=</code><em><glob-pattern></em></dt>
<dd>
<p>Pretend as if all the refs matching shell glob <em><glob-pattern></em>
are listed on the command line as <em><commit></em>. Leading <em>refs/</em>,
is automatically prepended if missing. If pattern lacks <em>?</em>, <em>*</em>,
or <em>[</em>, <em>/*</em> at the end is implied.</p>
</dd>
-<dt class="hdlist1">--exclude=<glob-pattern></dt>
+<dt class="hdlist1"><code>--exclude=</code><em><glob-pattern></em></dt>
<dd>
<p>Do not include refs matching <em><glob-pattern></em> that the next <code>--all</code>,
<code>--branches</code>, <code>--tags</code>, <code>--remotes</code>, or <code>--glob</code> would otherwise
@@ -901,7 +909,7 @@
explicitly.</p>
</div>
</dd>
-<dt class="hdlist1">--exclude-hidden=[fetch|receive|uploadpack]</dt>
+<dt class="hdlist1"><code>--exclude-hidden=</code>(<code>fetch</code>|<code>receive</code>|<code>uploadpack</code>)</dt>
<dd>
<p>Do not include refs that would be hidden by <code>git-fetch</code>,
<code>git-receive-pack</code> or <code>git-upload-pack</code> by consulting the appropriate
@@ -910,12 +918,12 @@
<a href="git-config.html">git-config(1)</a>). This option affects the next pseudo-ref option
<code>--all</code> or <code>--glob</code> and is cleared after processing them.</p>
</dd>
-<dt class="hdlist1">--reflog</dt>
+<dt class="hdlist1"><code>--reflog</code></dt>
<dd>
<p>Pretend as if all objects mentioned by reflogs are listed on the
command line as <em><commit></em>.</p>
</dd>
-<dt class="hdlist1">--alternate-refs</dt>
+<dt class="hdlist1"><code>--alternate-refs</code></dt>
<dd>
<p>Pretend as if all objects mentioned as ref tips of alternate
repositories were listed on the command line. An alternate
@@ -924,7 +932,7 @@
be modified by <code>core.alternateRefsCommand</code>, etc. See
<a href="git-config.html">git-config(1)</a>.</p>
</dd>
-<dt class="hdlist1">--single-worktree</dt>
+<dt class="hdlist1"><code>--single-worktree</code></dt>
<dd>
<p>By default, all working trees will be examined by the
following options when there are more than one (see
@@ -933,19 +941,19 @@
This option forces them to examine the current working tree
only.</p>
</dd>
-<dt class="hdlist1">--ignore-missing</dt>
+<dt class="hdlist1"><code>--ignore-missing</code></dt>
<dd>
<p>Upon seeing an invalid object name in the input, pretend as if
the bad input was not given.</p>
</dd>
-<dt class="hdlist1">--bisect</dt>
+<dt class="hdlist1"><code>--bisect</code></dt>
<dd>
<p>Pretend as if the bad bisection ref <code>refs/bisect/bad</code>
was listed and as if it was followed by <code>--not</code> and the good
bisection refs <code>refs/bisect/good-*</code> on the command
line.</p>
</dd>
-<dt class="hdlist1">--stdin</dt>
+<dt class="hdlist1"><code>--stdin</code></dt>
<dd>
<p>In addition to getting arguments from the command line, read
them from standard input as well. This accepts commits and
@@ -955,12 +963,12 @@
are only respected for arguments passed in the same way and will not
influence any subsequent command line arguments.</p>
</dd>
-<dt class="hdlist1">--cherry-mark</dt>
+<dt class="hdlist1"><code>--cherry-mark</code></dt>
<dd>
<p>Like <code>--cherry-pick</code> (see below) but mark equivalent commits
with <code>=</code> rather than omitting them, and inequivalent ones with <code>+</code>.</p>
</dd>
-<dt class="hdlist1">--cherry-pick</dt>
+<dt class="hdlist1"><code>--cherry-pick</code></dt>
<dd>
<p>Omit any commit that introduces the same change as
another commit on the “other side” when the set of
@@ -975,8 +983,8 @@
excluded from the output.</p>
</div>
</dd>
-<dt class="hdlist1">--left-only</dt>
-<dt class="hdlist1">--right-only</dt>
+<dt class="hdlist1"><code>--left-only</code></dt>
+<dt class="hdlist1"><code>--right-only</code></dt>
<dd>
<p>List only commits on the respective side of a symmetric difference,
i.e. only those which would be marked < resp. > by
@@ -989,7 +997,7 @@
list.</p>
</div>
</dd>
-<dt class="hdlist1">--cherry</dt>
+<dt class="hdlist1"><code>--cherry</code></dt>
<dd>
<p>A synonym for <code>--right-only</code> <code>--cherry-mark</code> <code>--no-merges</code>; useful to
limit the output to the commits on our side and mark those that
@@ -997,14 +1005,14 @@
<code>git</code> <code>log</code> <code>--cherry</code> <code>upstream</code><code>...</code><code>mybranch</code>, similar to
<code>git</code> <code>cherry</code> <code>upstream</code> <code>mybranch</code>.</p>
</dd>
-<dt class="hdlist1">-g</dt>
-<dt class="hdlist1">--walk-reflogs</dt>
+<dt class="hdlist1"><code>-g</code></dt>
+<dt class="hdlist1"><code>--walk-reflogs</code></dt>
<dd>
<p>Instead of walking the commit ancestry chain, walk
reflog entries from the most recent one to older ones.
When this option is used you cannot specify commits to
-exclude (that is, <em>^commit</em>, <em>commit1..commit2</em>,
-and <em>commit1...commit2</em> notations cannot be used).</p>
+exclude (that is, <code>^</code><em><commit></em>, <em><commit1></em><code>..</code><em><commit2></em>,
+and <em><commit1></em><code>...</code><em><commit2></em> notations cannot be used).</p>
<div class="paragraph">
<p>With <code>--pretty</code> format other than <code>oneline</code> and <code>reference</code> (for obvious reasons),
this causes the output to have two extra lines of information
@@ -1046,7 +1054,7 @@
<p>Under <code>--pretty=reference</code>, this information will not be shown at all.</p>
</div>
</dd>
-<dt class="hdlist1">--merge</dt>
+<dt class="hdlist1"><code>--merge</code></dt>
<dd>
<p>Show commits touching conflicted paths in the range <code>HEAD</code><code>...</code><em><other></em>,
where <em><other></em> is the first existing pseudoref in <code>MERGE_HEAD</code>,
@@ -1054,7 +1062,7 @@
when the index has unmerged entries. This option can be used to show
relevant commits when resolving conflicts from a 3-way merge.</p>
</dd>
-<dt class="hdlist1">--boundary</dt>
+<dt class="hdlist1"><code>--boundary</code></dt>
<dd>
<p>Output excluded boundary commits. Boundary commits are
prefixed with <code>-</code>.</p>
@@ -1075,11 +1083,11 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1"><paths></dt>
+<dt class="hdlist1"><em><paths></em></dt>
<dd>
<p>Commits modifying the given <paths> are selected.</p>
</dd>
-<dt class="hdlist1">--simplify-by-decoration</dt>
+<dt class="hdlist1"><code>--simplify-by-decoration</code></dt>
<dd>
<p>Commits that are referred by some branch or tag are selected.</p>
</dd>
@@ -1093,47 +1101,47 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">Default mode</dt>
+<dt class="hdlist1"><code>Default</code> <code>mode</code></dt>
<dd>
<p>Simplifies the history to the simplest history explaining the
final state of the tree. Simplest because it prunes some side
branches if the end result is the same (i.e. merging branches
with the same content)</p>
</dd>
-<dt class="hdlist1">--show-pulls</dt>
+<dt class="hdlist1"><code>--show-pulls</code></dt>
<dd>
<p>Include all commits from the default mode, but also any merge
commits that are not TREESAME to the first parent but are
TREESAME to a later parent. This mode is helpful for showing
the merge commits that "first introduced" a change to a branch.</p>
</dd>
-<dt class="hdlist1">--full-history</dt>
+<dt class="hdlist1"><code>--full-history</code></dt>
<dd>
<p>Same as the default mode, but does not prune some history.</p>
</dd>
-<dt class="hdlist1">--dense</dt>
+<dt class="hdlist1"><code>--dense</code></dt>
<dd>
<p>Only the selected commits are shown, plus some to have a
meaningful history.</p>
</dd>
-<dt class="hdlist1">--sparse</dt>
+<dt class="hdlist1"><code>--sparse</code></dt>
<dd>
<p>All commits in the simplified history are shown.</p>
</dd>
-<dt class="hdlist1">--simplify-merges</dt>
+<dt class="hdlist1"><code>--simplify-merges</code></dt>
<dd>
<p>Additional option to <code>--full-history</code> to remove some needless
merges from the resulting history, as there are no selected
commits contributing to this merge.</p>
</dd>
-<dt class="hdlist1">--ancestry-path[=<commit>]</dt>
+<dt class="hdlist1"><code>--ancestry-path</code>[<code>=</code><em><commit></em>]</dt>
<dd>
-<p>When given a range of commits to display (e.g. <em>commit1..commit2</em>
-or <em>commit2 ^commit1</em>), and a commit <commit> in that range,
+<p>When given a range of commits to display (e.g. <em><commit1></em><code>..</code><em><commit2></em>
+or <em><commit2></em> <code>^</code><em><commit1></em>), and a commit <em><commit></em> in that range,
only display commits in that range
-that are ancestors of <commit>, descendants of <commit>, or
-<commit> itself. If no commit is specified, use <em>commit1</em> (the
-excluded part of the range) as <commit>. Can be passed multiple
+that are ancestors of <em><commit></em>, descendants of <em><commit></em>, or
+<em><commit></em> itself. If no commit is specified, use <em><commit1></em> (the
+excluded part of the range) as <em><commit></em>. Can be passed multiple
times; if so, a commit is included if it is any of the commits
given or if it is an ancestor or descendant of one of them.</p>
</dd>
@@ -1143,7 +1151,7 @@
<p>A more detailed explanation follows.</p>
</div>
<div class="paragraph">
-<p>Suppose you specified <code>foo</code> as the <paths>. We shall call commits
+<p>Suppose you specified <code>foo</code> as the <em><paths></em>. We shall call commits
that modify <code>foo</code> !TREESAME, and the rest TREESAME. (In a diff
filtered for <code>foo</code>, they look different and equal, respectively.)</p>
</div>
@@ -1169,27 +1177,27 @@
<ul>
<li>
<p><code>I</code> is the initial commit, in which <code>foo</code> exists with contents
-“asdf”, and a file <code>quux</code> exists with contents “quux”. Initial
+<code>asdf</code>, and a file <code>quux</code> exists with contents <code>quux</code>. Initial
commits are compared to an empty tree, so <code>I</code> is !TREESAME.</p>
</li>
<li>
-<p>In <code>A</code>, <code>foo</code> contains just “foo”.</p>
+<p>In <code>A</code>, <code>foo</code> contains just <code>foo</code>.</p>
</li>
<li>
<p><code>B</code> contains the same change as <code>A</code>. Its merge <code>M</code> is trivial and
hence TREESAME to all parents.</p>
</li>
<li>
-<p><code>C</code> does not change <code>foo</code>, but its merge <code>N</code> changes it to “foobar”,
+<p><code>C</code> does not change <code>foo</code>, but its merge <code>N</code> changes it to <code>foobar</code>,
so it is not TREESAME to any parent.</p>
</li>
<li>
-<p><code>D</code> sets <code>foo</code> to “baz”. Its merge <code>O</code> combines the strings from
-<code>N</code> and <code>D</code> to “foobarbaz”; i.e., it is not TREESAME to any parent.</p>
+<p><code>D</code> sets <code>foo</code> to <code>baz</code>. Its merge <code>O</code> combines the strings from
+<code>N</code> and <code>D</code> to <code>foobarbaz</code>; i.e., it is not TREESAME to any parent.</p>
</li>
<li>
-<p><code>E</code> changes <code>quux</code> to “xyzzy”, and its merge <code>P</code> combines the
-strings to “quux xyzzy”. <code>P</code> is TREESAME to <code>O</code>, but not to <code>E</code>.</p>
+<p><code>E</code> changes <code>quux</code> to <code>xyzzy</code>, and its merge <code>P</code> combines the
+strings to <code>quux</code> <code>xyzzy</code>. <code>P</code> is TREESAME to <code>O</code>, but not to <code>E</code>.</p>
</li>
<li>
<p><code>X</code> is an independent root commit that added a new file <code>side</code>, and <code>Y</code>
@@ -1236,7 +1244,7 @@
parent lines.</p>
</div>
</dd>
-<dt class="hdlist1">--full-history without parent rewriting</dt>
+<dt class="hdlist1"><code>--full-history</code> without parent rewriting</dt>
<dd>
<p>This mode differs from the default in one point: always follow
all parents of a merge, even if it is TREESAME to one of them.
@@ -1259,7 +1267,7 @@
them disconnected.</p>
</div>
</dd>
-<dt class="hdlist1">--full-history with parent rewriting</dt>
+<dt class="hdlist1"><code>--full-history</code> with parent rewriting</dt>
<dd>
<p>Ordinary commits are only included if they are !TREESAME
(though this can be changed, see <code>--sparse</code> below).</p>
@@ -1292,12 +1300,12 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--dense</dt>
+<dt class="hdlist1"><code>--dense</code></dt>
<dd>
<p>Commits that are walked are included if they are not TREESAME
to any parent.</p>
</dd>
-<dt class="hdlist1">--sparse</dt>
+<dt class="hdlist1"><code>--sparse</code></dt>
<dd>
<p>All commits that are walked are included.</p>
<div class="paragraph">
@@ -1306,7 +1314,7 @@
sides of the merge are never walked.</p>
</div>
</dd>
-<dt class="hdlist1">--simplify-merges</dt>
+<dt class="hdlist1"><code>--simplify-merges</code></dt>
<dd>
<p>First, build a history graph in the same way that
<code>--full-history</code> with parent rewriting does (see above).</p>
@@ -1381,10 +1389,10 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--ancestry-path[=<commit>]</dt>
+<dt class="hdlist1"><code>--ancestry-path</code>[<code>=</code><em><commit></em>]</dt>
<dd>
<p>Limit the displayed commits to those which are an ancestor of
-<commit>, or which are a descendant of <commit>, or are <commit>
+<em><commit></em>, or which are a descendant of <em><commit></em>, or are <em><commit></em>
itself.</p>
<div class="paragraph">
<p>As an example use case, consider the following commit history:</p>
@@ -1402,16 +1410,16 @@
<p>A regular <em>D..M</em> computes the set of commits that are ancestors of <code>M</code>,
but excludes the ones that are ancestors of <code>D</code>. This is useful to see
what happened to the history leading to <code>M</code> since <code>D</code>, in the sense
-that “what does <code>M</code> have that did not exist in <code>D</code>”. The result in this
+that "what does <code>M</code> have that did not exist in <code>D</code>". The result in this
example would be all the commits, except <code>A</code> and <code>B</code> (and <code>D</code> itself,
of course).</p>
</div>
<div class="paragraph">
<p>When we want to find out what commits in <code>M</code> are contaminated with the
bug introduced by <code>D</code> and need fixing, however, we might want to view
-only the subset of <em>D..M</em> that are actually descendants of <code>D</code>, i.e.
+only the subset of <code>D</code><code>..</code><code>M</code> that are actually descendants of <code>D</code>, i.e.
excluding <code>C</code> and <code>K</code>. This is exactly what the <code>--ancestry-path</code>
-option does. Applied to the <em>D..M</em> range, it results in:</p>
+option does. Applied to the <code>D</code><code>..</code><code>M</code> range, it results in:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -1424,7 +1432,7 @@
</div>
<div class="paragraph">
<p>We can also use <code>--ancestry-path=D</code> instead of <code>--ancestry-path</code> which
-means the same thing when applied to the <em>D..M</em> range but is just more
+means the same thing when applied to the <code>D</code><code>..</code><code>M</code> range but is just more
explicit.</p>
</div>
<div class="paragraph">
@@ -1562,7 +1570,7 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--show-pulls</dt>
+<dt class="hdlist1"><code>--show-pulls</code></dt>
<dd>
<p>In addition to the commits shown in the default history, show
each merge commit that is not TREESAME to its first parent but
@@ -1624,17 +1632,17 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--date-order</dt>
+<dt class="hdlist1"><code>--date-order</code></dt>
<dd>
<p>Show no parents before all of its children are shown, but
otherwise show commits in the commit timestamp order.</p>
</dd>
-<dt class="hdlist1">--author-date-order</dt>
+<dt class="hdlist1"><code>--author-date-order</code></dt>
<dd>
<p>Show no parents before all of its children are shown, but
otherwise show commits in the author timestamp order.</p>
</dd>
-<dt class="hdlist1">--topo-order</dt>
+<dt class="hdlist1"><code>--topo-order</code></dt>
<dd>
<p>Show no parents before all of its children are shown, and
avoid showing commits on multiple lines of history
@@ -1661,9 +1669,9 @@
together.</p>
</div>
</dd>
-<dt class="hdlist1">--reverse</dt>
+<dt class="hdlist1"><code>--reverse</code></dt>
<dd>
-<p>Output the commits chosen to be shown (see Commit Limiting
+<p>Output the commits chosen to be shown (see <em>Commit Limiting</em>
section above) in reverse order. Cannot be combined with
<code>--walk-reflogs</code>.</p>
</dd>
@@ -1677,7 +1685,7 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--no-walk[=(sorted|unsorted)]</dt>
+<dt class="hdlist1"><code>--no-walk</code>[<code>=</code>(<code>sorted</code>|<code>unsorted</code>)]</dt>
<dd>
<p>Only show the given commits, but do not traverse their ancestors.
This has no effect if a range is specified. If the argument
@@ -1687,7 +1695,7 @@
by commit time.
Cannot be combined with <code>--graph</code>.</p>
</dd>
-<dt class="hdlist1">--do-walk</dt>
+<dt class="hdlist1"><code>--do-walk</code></dt>
<dd>
<p>Overrides a previous <code>--no-walk</code>.</p>
</dd>
@@ -1698,47 +1706,56 @@
<h3 id="_commit_formatting">Commit Formatting</h3>
<div class="dlist">
<dl>
-<dt class="hdlist1">--pretty[=<format>]</dt>
-<dt class="hdlist1">--format=<format></dt>
+<dt class="hdlist1"><code>--pretty</code>[<code>=</code><em><format></em>]</dt>
+<dt class="hdlist1"><code>--format=</code><em><format></em></dt>
<dd>
<p>Pretty-print the contents of the commit logs in a given format,
-where <em><format></em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,
-<em>full</em>, <em>fuller</em>, <em>reference</em>, <em>email</em>, <em>raw</em>, <em>format:<string></em>
-and <em>tformat:<string></em>. When <em><format></em> is none of the above,
-and has <em>%placeholder</em> in it, it acts as if
-<em>--pretty=tformat:<format></em> were given.</p>
+where <em><format></em> can be one of <code>oneline</code>, <code>short</code>, <code>medium</code>,
+<code>full</code>, <code>fuller</code>, <code>reference</code>, <code>email</code>, <code>raw</code>, <code>format:</code><em><string></em>
+and <code>tformat:</code><em><string></em>. When <em><format></em> is none of the above,
+and has <code>%</code><em><placeholder></em> in it, it acts as if
+<code>--pretty=tformat:</code><em><format></em> were given.</p>
<div class="paragraph">
<p>See the "PRETTY FORMATS" section for some additional details for each
-format. When <em>=<format></em> part is omitted, it defaults to <em>medium</em>.</p>
+format. When <code>=</code><em><format></em> part is omitted, it defaults to <code>medium</code>.</p>
</div>
-<div class="paragraph">
-<p>Note: you can specify the default pretty format in the repository
-configuration (see <a href="git-config.html">git-config(1)</a>).</p>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+you can specify the default pretty format in the repository
+configuration (see <a href="git-config.html">git-config(1)</a>).
+</td>
+</tr>
+</table>
</div>
</dd>
-<dt class="hdlist1">--abbrev-commit</dt>
+<dt class="hdlist1"><code>--abbrev-commit</code></dt>
<dd>
<p>Instead of showing the full 40-byte hexadecimal commit object
name, show a prefix that names the object uniquely.
-"--abbrev=<n>" (which also modifies diff output, if it is displayed)
+<code>--abbrev=</code><em><n></em> (which also modifies diff output, if it is displayed)
option can be used to specify the minimum length of the prefix.</p>
<div class="paragraph">
-<p>This should make "--pretty=oneline" a whole lot more readable for
+<p>This should make <code>--pretty=oneline</code> a whole lot more readable for
people using 80-column terminals.</p>
</div>
</dd>
-<dt class="hdlist1">--no-abbrev-commit</dt>
+<dt class="hdlist1"><code>--no-abbrev-commit</code></dt>
<dd>
<p>Show the full 40-byte hexadecimal commit object name. This negates
<code>--abbrev-commit</code>, either explicit or implied by other options such
-as "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.</p>
+as <code>--oneline</code>. It also overrides the <code>log.abbrevCommit</code> variable.</p>
</dd>
-<dt class="hdlist1">--oneline</dt>
+<dt class="hdlist1"><code>--oneline</code></dt>
<dd>
-<p>This is a shorthand for "--pretty=oneline --abbrev-commit"
+<p>This is a shorthand for <code>--pretty=oneline</code> <code>--abbrev-commit</code>
used together.</p>
</dd>
-<dt class="hdlist1">--encoding=<encoding></dt>
+<dt class="hdlist1"><code>--encoding=</code><em><encoding></em></dt>
<dd>
<p>Commit objects record the character encoding used for the log message
in their encoding header; this option can be used to tell the
@@ -1751,9 +1768,9 @@
to convert the commit, we will quietly output the original
object verbatim.</p>
</dd>
-<dt class="hdlist1">--expand-tabs=<n></dt>
-<dt class="hdlist1">--expand-tabs</dt>
-<dt class="hdlist1">--no-expand-tabs</dt>
+<dt class="hdlist1"><code>--expand-tabs=</code><em><n></em></dt>
+<dt class="hdlist1"><code>--expand-tabs</code></dt>
+<dt class="hdlist1"><code>--no-expand-tabs</code></dt>
<dd>
<p>Perform a tab expansion (replace each tab with enough spaces
to fill to the next display column that is a multiple of <em><n></em>)
@@ -1763,11 +1780,11 @@
which disables tab expansion.</p>
<div class="paragraph">
<p>By default, tabs are expanded in pretty formats that indent the log
-message by 4 spaces (i.e. <em>medium</em>, which is the default, <em>full</em>,
-and <em>fuller</em>).</p>
+message by 4 spaces (i.e. <code>medium</code>, which is the default, <code>full</code>,
+and <code>fuller</code>).</p>
</div>
</dd>
-<dt class="hdlist1">--notes[=<ref>]</dt>
+<dt class="hdlist1"><code>--notes</code>[<code>=</code><em><ref></em>]</dt>
<dd>
<p>Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the
commit, when showing the commit log message. This is the default
@@ -1786,41 +1803,42 @@
<code>refs/notes/</code> is prefixed to form the full name of the ref.</p>
</div>
<div class="paragraph">
-<p>Multiple --notes options can be combined to control which notes are
-being displayed. Examples: "--notes=foo" will show only notes from
-"refs/notes/foo"; "--notes=foo --notes" will show both notes from
+<p>Multiple <code>--notes</code> options can be combined to control which notes are
+being displayed. Examples: "<code>--notes=foo</code>" will show only notes from
+<code>refs/notes/foo</code>; "<code>--notes=foo</code> <code>--notes</code>" will show both notes from
"refs/notes/foo" and from the default notes ref(s).</p>
</div>
</dd>
-<dt class="hdlist1">--no-notes</dt>
+<dt class="hdlist1"><code>--no-notes</code></dt>
<dd>
<p>Do not show notes. This negates the above <code>--notes</code> option, by
resetting the list of notes refs from which notes are shown.
Options are parsed in the order given on the command line, so e.g.
-"--notes --notes=foo --no-notes --notes=bar" will only show notes
-from "refs/notes/bar".</p>
+"<code>--notes</code> <code>--notes=foo</code> <code>--no-notes</code> <code>--notes=bar</code>" will only show notes
+from <code>refs/notes/bar</code>.</p>
</dd>
-<dt class="hdlist1">--show-notes-by-default</dt>
+<dt class="hdlist1"><code>--show-notes-by-default</code></dt>
<dd>
<p>Show the default notes unless options for displaying specific
notes are given.</p>
</dd>
-<dt class="hdlist1">--show-notes[=<ref>]</dt>
-<dt class="hdlist1">--[no-]standard-notes</dt>
+<dt class="hdlist1"><code>--show-notes</code>[<code>=</code><em><ref></em>]</dt>
+<dt class="hdlist1"><code>--standard-notes</code></dt>
+<dt class="hdlist1"><code>--no-standard-notes</code></dt>
<dd>
-<p>These options are deprecated. Use the above --notes/--no-notes
+<p>These options are deprecated. Use the above <code>--notes</code>/<code>--no-notes</code>
options instead.</p>
</dd>
-<dt class="hdlist1">--show-signature</dt>
+<dt class="hdlist1"><code>--show-signature</code></dt>
<dd>
<p>Check the validity of a signed commit object by passing the signature
to <code>gpg</code> <code>--verify</code> and show the output.</p>
</dd>
-<dt class="hdlist1">--relative-date</dt>
+<dt class="hdlist1"><code>--relative-date</code></dt>
<dd>
<p>Synonym for <code>--date=relative</code>.</p>
</dd>
-<dt class="hdlist1">--date=<format></dt>
+<dt class="hdlist1"><code>--date=</code><em><format></em></dt>
<dd>
<p>Only takes effect for dates shown in human-readable format, such
as when using <code>--pretty</code>. <code>log.date</code> config variable sets a default
@@ -1871,7 +1889,7 @@
00:00:00 UTC), followed by a space, and then the timezone as an offset
from UTC (a <code>+</code> or <code>-</code> with four digits; the first two are hours, and
the second two are minutes). I.e., as if the timestamp were formatted
-with <code>strftime</code>("%s %z")).
+with <code>strftime</code>("%s <code>%z</code>")).
Note that the <code>-local</code> option does not affect the seconds-since-epoch
value (which is always measured in UTC), but does switch the accompanying
timezone value.</p>
@@ -1890,12 +1908,12 @@
has no effect.</p>
</div>
<div class="paragraph">
-<p><code>--date=format:..</code>. feeds the format <code>...</code> to your system <code>strftime</code>,
-except for %s, %z, and %Z, which are handled internally.
-Use <code>--date=format:</code>%c to show the date in your system locale’s
-preferred format. See the <code>strftime</code> manual for a complete list of
+<p><code>--date=format:</code><em><format></em> feeds the <em><format></em> to your system <code>strftime</code>,
+except for <code>%s</code>, <code>%z</code>, and <code>%Z</code>, which are handled internally.
+Use <code>--date=format:%c</code> to show the date in your system locale’s
+preferred format. See the <code>strftime</code>(3) manual for a complete list of
format placeholders. When using <code>-local</code>, the correct syntax is
-<code>--date=format-local:..</code>..</p>
+<code>--date=format-local:</code><em><format></em>.</p>
</div>
<div class="paragraph">
<p><code>--date=default</code> is the default format, and is based on ctime(3)
@@ -1907,17 +1925,17 @@
</div>
</div>
</dd>
-<dt class="hdlist1">--parents</dt>
+<dt class="hdlist1"><code>--parents</code></dt>
<dd>
<p>Print also the parents of the commit (in the form "commit parent…​").
Also enables parent rewriting, see <em>History Simplification</em> above.</p>
</dd>
-<dt class="hdlist1">--children</dt>
+<dt class="hdlist1"><code>--children</code></dt>
<dd>
<p>Print also the children of the commit (in the form "commit child…​").
Also enables parent rewriting, see <em>History Simplification</em> above.</p>
</dd>
-<dt class="hdlist1">--left-right</dt>
+<dt class="hdlist1"><code>--left-right</code></dt>
<dd>
<p>Mark which side of a symmetric difference a commit is reachable from.
Commits from the left side are prefixed with < and those from
@@ -1951,7 +1969,7 @@
</div>
</div>
</dd>
-<dt class="hdlist1">--graph</dt>
+<dt class="hdlist1"><code>--graph</code></dt>
<dd>
<p>Draw a text-based graphical representation of the commit history
on the left hand side of the output. This may cause extra lines
@@ -1966,9 +1984,9 @@
<code>--date-order</code> option may also be specified.</p>
</div>
</dd>
-<dt class="hdlist1">--show-linear-break[=<barrier>]</dt>
+<dt class="hdlist1"><code>--show-linear-break</code>[<code>=</code><em><barrier></em>]</dt>
<dd>
-<p>When --graph is not used, all history branches are flattened
+<p>When <code>--graph</code> is not used, all history branches are flattened
which can make it hard to see that the two consecutive commits
do not belong to a linear branch. This option puts a barrier
in between them in that case. If <em><barrier></em> is specified, it
@@ -1984,11 +2002,11 @@
<div class="sectionbody">
<div class="paragraph">
<p>If the commit is a merge, and if the pretty-format
-is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
-inserted before the <em>Author:</em> line. This line begins with
+is not <code>oneline</code>, <code>email</code> or <code>raw</code>, an additional line is
+inserted before the <code>Author:</code> line. This line begins with
"Merge: " and the hashes of ancestral commits are printed,
separated by spaces. Note that the listed commits may not
-necessarily be the list of the <strong>direct</strong> parent commits if you
+necessarily be the list of the <em>direct</em> parent commits if you
have limited your view of history: for example, if you are
only interested in changes related to a certain directory or
file.</p>
@@ -1997,14 +2015,14 @@
<p>There are several built-in formats, and you can define
additional formats by setting a pretty.<name>
config option to either another format name, or a
-<em>format:</em> string, as described below (see
+<code>format:</code> string, as described below (see
<a href="git-config.html">git-config(1)</a>). Here are the details of the
built-in formats:</p>
</div>
<div class="ulist">
<ul>
<li>
-<p><em>oneline</em></p>
+<p><code>oneline</code></p>
<div class="literalblock">
<div class="content">
<pre><hash> <title-line></pre>
@@ -2015,7 +2033,7 @@
</div>
</li>
<li>
-<p><em>short</em></p>
+<p><code>short</code></p>
<div class="literalblock">
<div class="content">
<pre>commit <hash>
@@ -2029,7 +2047,7 @@
</div>
</li>
<li>
-<p><em>medium</em></p>
+<p><code>medium</code></p>
<div class="literalblock">
<div class="content">
<pre>commit <hash>
@@ -2049,7 +2067,7 @@
</div>
</li>
<li>
-<p><em>full</em></p>
+<p><code>full</code></p>
<div class="literalblock">
<div class="content">
<pre>commit <hash>
@@ -2069,7 +2087,7 @@
</div>
</li>
<li>
-<p><em>fuller</em></p>
+<p><code>fuller</code></p>
<div class="literalblock">
<div class="content">
<pre>commit <hash>
@@ -2091,7 +2109,7 @@
</div>
</li>
<li>
-<p><em>reference</em></p>
+<p><code>reference</code></p>
<div class="literalblock">
<div class="content">
<pre><abbrev-hash> (<title-line>, <short-author-date>)</pre>
@@ -2099,7 +2117,7 @@
</div>
<div class="paragraph">
<p>This format is used to refer to another commit in a commit message and
-is the same as <code>--pretty=</code>'format:%C(<code>auto</code>)%h (%s, %ad)'. By default,
+is the same as <code>--pretty=</code>'format:%C(<code>auto</code>)<code>%h</code> (<code>%s,</code> <code>%ad</code>)'. By default,
the date is formatted with <code>--date=short</code> unless another <code>--date</code> option
is explicitly specified. As with any <code>format:</code> with format
placeholders, its output is not affected by other options like
@@ -2107,7 +2125,7 @@
</div>
</li>
<li>
-<p><em>email</em></p>
+<p><code>email</code></p>
<div class="literalblock">
<div class="content">
<pre>From <hash> <date>
@@ -2123,20 +2141,20 @@
</div>
</li>
<li>
-<p><em>mboxrd</em></p>
+<p><code>mboxrd</code></p>
<div class="paragraph">
-<p>Like <em>email</em>, but lines in the commit message starting with "From "
+<p>Like <code>email</code>, but lines in the commit message starting with "From "
(preceded by zero or more ">") are quoted with ">" so they aren’t
confused as starting a new commit.</p>
</div>
</li>
<li>
-<p><em>raw</em></p>
+<p><code>raw</code></p>
<div class="paragraph">
-<p>The <em>raw</em> format shows the entire commit exactly as
+<p>The <code>raw</code> format shows the entire commit exactly as
stored in the commit object. Notably, the hashes are
-displayed in full, regardless of whether --abbrev or
---no-abbrev are used, and <em>parents</em> information show the
+displayed in full, regardless of whether <code>--abbrev</code> or
+<code>--no-abbrev</code> are used, and <em>parents</em> information show the
true parent commits, without taking grafts or history
simplification into account. Note that this format affects the way
commits are displayed, but not the way the diff is shown e.g. with
@@ -2145,12 +2163,12 @@
</div>
</li>
<li>
-<p><em>format:<format-string></em></p>
+<p><code>format:</code><em><format-string></em></p>
<div class="paragraph">
-<p>The <em>format:<format-string></em> format allows you to specify which information
+<p>The <code>format:</code><em><format-string></em> format allows you to specify which information
you want to show. It works a little bit like printf format,
-with the notable exception that you get a newline with <em>%n</em>
-instead of <em>\n</em>.</p>
+with the notable exception that you get a newline with <code>%n</code>
+instead of <code>\n</code>.</p>
</div>
<div class="paragraph">
<p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
@@ -2171,17 +2189,17 @@
<p>Placeholders that expand to a single literal character:</p>
<div class="dlist">
<dl>
-<dt class="hdlist1"><em>%n</em></dt>
+<dt class="hdlist1"><code>%n</code></dt>
<dd>
<p>newline</p>
</dd>
-<dt class="hdlist1"><em>%%</em></dt>
+<dt class="hdlist1"><code>%%</code></dt>
<dd>
-<p>a raw <em>%</em></p>
+<p>a raw <code>%</code></p>
</dd>
-<dt class="hdlist1"><em>%x00</em></dt>
+<dt class="hdlist1"><code>%x00</code></dt>
<dd>
-<p><em>%x</em> followed by two hexadecimal digits is replaced with a
+<p><code>%x</code> followed by two hexadecimal digits is replaced with a
byte with the hexadecimal digits' value (we will call this
"literal formatting code" in the rest of this document).</p>
</dd>
@@ -2192,60 +2210,60 @@
<p>Placeholders that affect formatting of later placeholders:</p>
<div class="dlist">
<dl>
-<dt class="hdlist1"><em>%Cred</em></dt>
+<dt class="hdlist1"><code>%Cred</code></dt>
<dd>
<p>switch color to red</p>
</dd>
-<dt class="hdlist1"><em>%Cgreen</em></dt>
+<dt class="hdlist1"><code>%Cgreen</code></dt>
<dd>
<p>switch color to green</p>
</dd>
-<dt class="hdlist1"><em>%Cblue</em></dt>
+<dt class="hdlist1"><code>%Cblue</code></dt>
<dd>
<p>switch color to blue</p>
</dd>
-<dt class="hdlist1"><em>%Creset</em></dt>
+<dt class="hdlist1"><code>%Creset</code></dt>
<dd>
<p>reset color</p>
</dd>
-<dt class="hdlist1"><em>%C(…​)</em></dt>
+<dt class="hdlist1"><code>%C</code>(<em><spec></em>)</dt>
<dd>
<p>color specification, as described under Values in the
"CONFIGURATION FILE" section of <a href="git-config.html">git-config(1)</a>. By
default, colors are shown only when enabled for log output
(by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and respecting
the <code>auto</code> settings of the former if we are going to a
-terminal). %C(<code>auto,</code><code>...</code>) is accepted as a historical
-synonym for the default (e.g., %C(<code>auto,red</code>)). Specifying
-%C(<code>always,</code><code>...</code>) will show the colors even when color is
+terminal). <code>%C</code>(<code>auto,</code><em><spec></em>) is accepted as a historical
+synonym for the default (e.g., <code>%C</code>(<code>auto,red</code>)). Specifying
+<code>%C</code>(<code>always,</code><em><spec></em>) will show the colors even when color is
not otherwise enabled (though consider just using
-<code>--color=always</code> to enable color for the whole output,
+<code>--color=always</code> to enable color for the whole output,
including this format and anything else git might color).
-<code>auto</code> alone (i.e. %C(<code>auto</code>)) will turn on auto coloring
+<code>auto</code> alone (i.e. <code>%C</code>(<code>auto</code>)) will turn on auto coloring
on the next placeholders until the color is switched
again.</p>
</dd>
-<dt class="hdlist1"><em>%m</em></dt>
+<dt class="hdlist1"><code>%m</code></dt>
<dd>
<p>left (<), right (>) or boundary (<code>-</code>) mark</p>
</dd>
-<dt class="hdlist1"><em>%w([<w>[,<i1>[,<i2>]]])</em></dt>
+<dt class="hdlist1"><code>%w</code>([<em><w></em>[<code>,</code><em><i1></em>[<code>,</code><em><i2></em>]]])</dt>
<dd>
-<p>switch line wrapping, like the -w option of
+<p>switch line wrapping, like the <code>-w</code> option of
<a href="git-shortlog.html">git-shortlog(1)</a>.</p>
</dd>
-<dt class="hdlist1"><em>%<( <N> [,trunc|ltrunc|mtrunc])</em></dt>
+<dt class="hdlist1"><code>%</code><(<em><n></em>[<code>,</code>(<code>trunc</code>|<code>ltrunc</code>|<code>mtrunc</code>)])</dt>
<dd>
<p>make the next placeholder take at
least N column widths, padding spaces on
the right if necessary. Optionally
-truncate (with ellipsis <em>..</em>) at the left (ltrunc) <code>..</code><code>ft</code>,
+truncate (with ellipsis <code>..</code>) at the left (ltrunc) <code>..</code><code>ft</code>,
the middle (mtrunc) <code>mi</code><code>..</code><code>le</code>, or the end
(trunc) <code>rig..</code>, if the output is longer than
-N columns.
+<em><n></em> columns.
Note 1: that truncating
-only works correctly with N >= 2.
-Note 2: spaces around the N and M (see below)
+only works correctly with <em><n></em> >= 2.
+Note 2: spaces around the <em><n></em> and <em><m></em> (see below)
values are optional.
Note 3: Emojis and other wide characters
will take two display columns, which may
@@ -2253,29 +2271,32 @@
Note 4: decomposed character combining marks
may be misplaced at padding boundaries.</p>
</dd>
-<dt class="hdlist1"><em>%<|( <M> )</em></dt>
+<dt class="hdlist1"><code>%</code><|(<em><m></em> )</dt>
<dd>
-<p>make the next placeholder take at least until Mth
+<p>make the next placeholder take at least until <em><m></em> th
display column, padding spaces on the right if necessary.
-Use negative M values for column positions measured
+Use negative <em><m></em> values for column positions measured
from the right hand edge of the terminal window.</p>
</dd>
-<dt class="hdlist1"><em>%>( <N> )</em>, <em>%>|( <M> )</em></dt>
+<dt class="hdlist1"><code>%</code>>(<em><n></em>)</dt>
+<dt class="hdlist1"><code>%</code>>|(<em><m></em>)</dt>
<dd>
-<p>similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em> respectively,
+<p>similar to <code>%</code><(<em><n></em>), <code>%</code><|(<em><m></em>) respectively,
but padding spaces on the left</p>
</dd>
-<dt class="hdlist1"><em>%>>( <N> )</em>, <em>%>>|( <M> )</em></dt>
+<dt class="hdlist1"><code>%</code>>>(<em><n></em>)</dt>
+<dt class="hdlist1"><code>%</code>>>|(<em><m></em>)</dt>
<dd>
-<p>similar to <em>%>( <N> )</em>, <em>%>|( <M> )</em>
+<p>similar to <code>%</code>>(<em><n></em>), <code>%</code>>|(<em><m></em>)
respectively, except that if the next
placeholder takes more spaces than given and
there are spaces on its left, use those
spaces</p>
</dd>
-<dt class="hdlist1"><em>%><( <N> )</em>, <em>%><|( <M> )</em></dt>
+<dt class="hdlist1"><code>%</code>><(<em><n></em>)</dt>
+<dt class="hdlist1"><code>%</code>><|(<em><m></em>)</dt>
<dd>
-<p>similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em>
+<p>similar to <code>%</code><(<em><n></em>), <code>%</code><|(<em><m></em>)
respectively, but padding both sides
(i.e. the text is centered)</p>
</dd>
@@ -2286,181 +2307,181 @@
<p>Placeholders that expand to information extracted from the commit:</p>
<div class="dlist">
<dl>
-<dt class="hdlist1"><em>%H</em></dt>
+<dt class="hdlist1"><code>%H</code></dt>
<dd>
<p>commit hash</p>
</dd>
-<dt class="hdlist1"><em>%h</em></dt>
+<dt class="hdlist1"><code>%h</code></dt>
<dd>
<p>abbreviated commit hash</p>
</dd>
-<dt class="hdlist1"><em>%T</em></dt>
+<dt class="hdlist1"><code>%T</code></dt>
<dd>
<p>tree hash</p>
</dd>
-<dt class="hdlist1"><em>%t</em></dt>
+<dt class="hdlist1"><code>%t</code></dt>
<dd>
<p>abbreviated tree hash</p>
</dd>
-<dt class="hdlist1"><em>%P</em></dt>
+<dt class="hdlist1"><code>%P</code></dt>
<dd>
<p>parent hashes</p>
</dd>
-<dt class="hdlist1"><em>%p</em></dt>
+<dt class="hdlist1"><code>%p</code></dt>
<dd>
<p>abbreviated parent hashes</p>
</dd>
-<dt class="hdlist1"><em>%an</em></dt>
+<dt class="hdlist1"><code>%an</code></dt>
<dd>
<p>author name</p>
</dd>
-<dt class="hdlist1"><em>%aN</em></dt>
+<dt class="hdlist1"><code>%aN</code></dt>
<dd>
<p>author name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a>
or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%ae</em></dt>
+<dt class="hdlist1"><code>%ae</code></dt>
<dd>
<p>author email</p>
</dd>
-<dt class="hdlist1"><em>%aE</em></dt>
+<dt class="hdlist1"><code>%aE</code></dt>
<dd>
<p>author email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a>
or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%al</em></dt>
+<dt class="hdlist1"><code>%al</code></dt>
<dd>
-<p>author email local-part (the part before the <em>@</em> sign)</p>
+<p>author email local-part (the part before the <code>@</code> sign)</p>
</dd>
-<dt class="hdlist1"><em>%aL</em></dt>
+<dt class="hdlist1"><code>%aL</code></dt>
<dd>
-<p>author local-part (see <em>%al</em>) respecting .mailmap, see
+<p>author local-part (see <code>%al</code>) respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%ad</em></dt>
+<dt class="hdlist1"><code>%ad</code></dt>
<dd>
<p>author date (format respects --date= option)</p>
</dd>
-<dt class="hdlist1"><em>%aD</em></dt>
+<dt class="hdlist1"><code>%aD</code></dt>
<dd>
<p>author date, RFC2822 style</p>
</dd>
-<dt class="hdlist1"><em>%ar</em></dt>
+<dt class="hdlist1"><code>%ar</code></dt>
<dd>
<p>author date, relative</p>
</dd>
-<dt class="hdlist1"><em>%at</em></dt>
+<dt class="hdlist1"><code>%at</code></dt>
<dd>
<p>author date, UNIX timestamp</p>
</dd>
-<dt class="hdlist1"><em>%ai</em></dt>
+<dt class="hdlist1"><code>%ai</code></dt>
<dd>
<p>author date, ISO 8601-like format</p>
</dd>
-<dt class="hdlist1"><em>%aI</em></dt>
+<dt class="hdlist1"><code>%aI</code></dt>
<dd>
<p>author date, strict ISO 8601 format</p>
</dd>
-<dt class="hdlist1"><em>%as</em></dt>
+<dt class="hdlist1"><code>%as</code></dt>
<dd>
<p>author date, short format (<code>YYYY-MM-DD</code>)</p>
</dd>
-<dt class="hdlist1"><em>%ah</em></dt>
+<dt class="hdlist1"><code>%ah</code></dt>
<dd>
<p>author date, human style (like the <code>--date=human</code> option of
<a href="git-rev-list.html">git-rev-list(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%cn</em></dt>
+<dt class="hdlist1"><code>%cn</code></dt>
<dd>
<p>committer name</p>
</dd>
-<dt class="hdlist1"><em>%cN</em></dt>
+<dt class="hdlist1"><code>%cN</code></dt>
<dd>
<p>committer name (respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%ce</em></dt>
+<dt class="hdlist1"><code>%ce</code></dt>
<dd>
<p>committer email</p>
</dd>
-<dt class="hdlist1"><em>%cE</em></dt>
+<dt class="hdlist1"><code>%cE</code></dt>
<dd>
<p>committer email (respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%cl</em></dt>
+<dt class="hdlist1"><code>%cl</code></dt>
<dd>
-<p>committer email local-part (the part before the <em>@</em> sign)</p>
+<p>committer email local-part (the part before the <code>@</code> sign)</p>
</dd>
-<dt class="hdlist1"><em>%cL</em></dt>
+<dt class="hdlist1"><code>%cL</code></dt>
<dd>
-<p>committer local-part (see <em>%cl</em>) respecting .mailmap, see
+<p>committer local-part (see <code>%cl</code>) respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%cd</em></dt>
+<dt class="hdlist1"><code>%cd</code></dt>
<dd>
<p>committer date (format respects --date= option)</p>
</dd>
-<dt class="hdlist1"><em>%cD</em></dt>
+<dt class="hdlist1"><code>%cD</code></dt>
<dd>
<p>committer date, RFC2822 style</p>
</dd>
-<dt class="hdlist1"><em>%cr</em></dt>
+<dt class="hdlist1"><code>%cr</code></dt>
<dd>
<p>committer date, relative</p>
</dd>
-<dt class="hdlist1"><em>%ct</em></dt>
+<dt class="hdlist1"><code>%ct</code></dt>
<dd>
<p>committer date, UNIX timestamp</p>
</dd>
-<dt class="hdlist1"><em>%ci</em></dt>
+<dt class="hdlist1"><code>%ci</code></dt>
<dd>
<p>committer date, ISO 8601-like format</p>
</dd>
-<dt class="hdlist1"><em>%cI</em></dt>
+<dt class="hdlist1"><code>%cI</code></dt>
<dd>
<p>committer date, strict ISO 8601 format</p>
</dd>
-<dt class="hdlist1"><em>%cs</em></dt>
+<dt class="hdlist1"><code>%cs</code></dt>
<dd>
<p>committer date, short format (<code>YYYY-MM-DD</code>)</p>
</dd>
-<dt class="hdlist1"><em>%ch</em></dt>
+<dt class="hdlist1"><code>%ch</code></dt>
<dd>
<p>committer date, human style (like the <code>--date=human</code> option of
<a href="git-rev-list.html">git-rev-list(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%d</em></dt>
+<dt class="hdlist1"><code>%d</code></dt>
<dd>
<p>ref names, like the --decorate option of <a href="git-log.html">git-log(1)</a></p>
</dd>
-<dt class="hdlist1"><em>%D</em></dt>
+<dt class="hdlist1"><code>%D</code></dt>
<dd>
<p>ref names without the " (", ")" wrapping.</p>
</dd>
-<dt class="hdlist1"><em>%(decorate[:<options>])</em></dt>
+<dt class="hdlist1"><code>%</code>(<code>decorate</code>[<code>:</code><em><option></em><code>,..</code>.])</dt>
<dd>
<p>ref names with custom decorations. The <code>decorate</code> string may be followed by a
colon and zero or more comma-separated options. Option values may contain
-literal formatting codes. These must be used for commas (%x2C) and closing
-parentheses (%x29), due to their role in the option syntax.</p>
+literal formatting codes. These must be used for commas (<code>%x2C</code>) and closing
+parentheses (<code>%x29</code>), due to their role in the option syntax.</p>
<div class="ulist">
<ul>
<li>
-<p><em>prefix=<value></em>: Shown before the list of ref names. Defaults to " (".</p>
+<p><code>prefix=</code><em><value></em>: Shown before the list of ref names. Defaults to " +(+".</p>
</li>
<li>
-<p><em>suffix=<value></em>: Shown after the list of ref names. Defaults to ")".</p>
+<p><code>suffix=</code><em><value></em>: Shown after the list of ref names. Defaults to ")".</p>
</li>
<li>
-<p><em>separator=<value></em>: Shown between ref names. Defaults to "<code>,</code> ".</p>
+<p><code>separator=</code><em><value></em>: Shown between ref names. Defaults to "<code>,</code> ".</p>
</li>
<li>
-<p><em>pointer=<value></em>: Shown between HEAD and the branch it points to, if any.
-Defaults to " <code>-</code>> ".</p>
+<p><code>pointer=</code><em><value></em>: Shown between HEAD and the branch it points to, if any.
+Defaults to " +→+ ".</p>
</li>
<li>
-<p><em>tag=<value></em>: Shown before tag names. Defaults to "<code>tag:</code> ".</p>
+<p><code>tag=</code><em><value></em>: Shown before tag names. Defaults to "<code>tag:</code> ".</p>
</li>
</ul>
</div>
@@ -2476,11 +2497,11 @@
</div>
<div class="paragraph">
<p>+
-%(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p>
+<code>%</code>(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p>
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1"><em>%(describe[:<options>])</em></dt>
+<dt class="hdlist1"><code>%</code>(<code>describe</code>[<code>:</code><em><option></em><code>,..</code>.])</dt>
<dd>
<p>human-readable name, like <a href="git-describe.html">git-describe(1)</a>; empty string for
undescribable commits. The <code>describe</code> string may be followed by a colon and
@@ -2489,60 +2510,60 @@
<div class="ulist">
<ul>
<li>
-<p><em>tags[=<bool-value>]</em>: Instead of only considering annotated tags,
+<p><code>tags</code>[<code>=</code><em><bool-value></em>]: Instead of only considering annotated tags,
consider lightweight tags as well.</p>
</li>
<li>
-<p><em>abbrev=<number></em>: Instead of using the default number of hexadecimal digits
+<p><code>abbrev=</code><em><number></em>: Instead of using the default number of hexadecimal digits
(which will vary according to the number of objects in the repository with a
default of 7) of the abbreviated object name, use <number> digits, or as many
digits as needed to form a unique object name.</p>
</li>
<li>
-<p><em>match=<pattern></em>: Only consider tags matching the given
-<code>glob</code>(<code>7</code>) pattern, excluding the "refs/tags/" prefix.</p>
+<p><code>match=</code><em><pattern></em>: Only consider tags matching the given
+<code>glob</code>(<code>7</code>) <em><pattern></em>, excluding the <code>refs/tags/</code> prefix.</p>
</li>
<li>
-<p><em>exclude=<pattern></em>: Do not consider tags matching the given
-<code>glob</code>(<code>7</code>) pattern, excluding the "refs/tags/" prefix.</p>
+<p><code>exclude=</code><em><pattern></em>: Do not consider tags matching the given
+<code>glob</code>(<code>7</code>) <em><pattern></em>, excluding the <code>refs/tags/</code> prefix.</p>
</li>
</ul>
</div>
</dd>
-<dt class="hdlist1"><em>%S</em></dt>
+<dt class="hdlist1"><code>%S</code></dt>
<dd>
<p>ref name given on the command line by which the commit was reached
(like <code>git</code> <code>log</code> <code>--source</code>), only works with <code>git</code> <code>log</code></p>
</dd>
-<dt class="hdlist1"><em>%e</em></dt>
+<dt class="hdlist1"><code>%e</code></dt>
<dd>
<p>encoding</p>
</dd>
-<dt class="hdlist1"><em>%s</em></dt>
+<dt class="hdlist1"><code>%s</code></dt>
<dd>
<p>subject</p>
</dd>
-<dt class="hdlist1"><em>%f</em></dt>
+<dt class="hdlist1"><code>%f</code></dt>
<dd>
<p>sanitized subject line, suitable for a filename</p>
</dd>
-<dt class="hdlist1"><em>%b</em></dt>
+<dt class="hdlist1"><code>%b</code></dt>
<dd>
<p>body</p>
</dd>
-<dt class="hdlist1"><em>%B</em></dt>
+<dt class="hdlist1"><code>%B</code></dt>
<dd>
<p>raw body (unwrapped subject and body)</p>
</dd>
-<dt class="hdlist1"><em>%N</em></dt>
+<dt class="hdlist1"><code>%N</code></dt>
<dd>
<p>commit notes</p>
</dd>
-<dt class="hdlist1"><em>%GG</em></dt>
+<dt class="hdlist1"><code>%GG</code></dt>
<dd>
<p>raw verification message from GPG for a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%G?</em></dt>
+<dt class="hdlist1"><code>%G</code>?</dt>
<dd>
<p>show "G" for a good (valid) signature,
"B" for a bad signature,
@@ -2553,28 +2574,28 @@
"E" if the signature cannot be checked (e.g. missing key)
and "N" for no signature</p>
</dd>
-<dt class="hdlist1"><em>%GS</em></dt>
+<dt class="hdlist1"><code>%GS</code></dt>
<dd>
<p>show the name of the signer for a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%GK</em></dt>
+<dt class="hdlist1"><code>%GK</code></dt>
<dd>
<p>show the key used to sign a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%GF</em></dt>
+<dt class="hdlist1"><code>%GF</code></dt>
<dd>
<p>show the fingerprint of the key used to sign a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%GP</em></dt>
+<dt class="hdlist1"><code>%GP</code></dt>
<dd>
<p>show the fingerprint of the primary key whose subkey was used
to sign a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%GT</em></dt>
+<dt class="hdlist1"><code>%GT</code></dt>
<dd>
<p>show the trust level for the key used to sign a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%gD</em></dt>
+<dt class="hdlist1"><code>%gD</code></dt>
<dd>
<p>reflog selector, e.g., <code>refs/stash@</code>{1} or <code>refs/stash@</code>{2
<code>minutes</code> <code>ago</code>}; the format follows the rules described for the
@@ -2582,35 +2603,35 @@
given on the command line (so <code>git</code> <code>log</code> <code>-g</code> <code>refs/heads/master</code>
would yield <code>refs/heads/master@</code>{0}).</p>
</dd>
-<dt class="hdlist1"><em>%gd</em></dt>
+<dt class="hdlist1"><code>%gd</code></dt>
<dd>
-<p>shortened reflog selector; same as %gD, but the refname
+<p>shortened reflog selector; same as <code>%gD</code>, but the refname
portion is shortened for human readability (so
<code>refs/heads/master</code> becomes just <code>master</code>).</p>
</dd>
-<dt class="hdlist1"><em>%gn</em></dt>
+<dt class="hdlist1"><code>%gn</code></dt>
<dd>
<p>reflog identity name</p>
</dd>
-<dt class="hdlist1"><em>%gN</em></dt>
+<dt class="hdlist1"><code>%gN</code></dt>
<dd>
<p>reflog identity name (respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%ge</em></dt>
+<dt class="hdlist1"><code>%ge</code></dt>
<dd>
<p>reflog identity email</p>
</dd>
-<dt class="hdlist1"><em>%gE</em></dt>
+<dt class="hdlist1"><code>%gE</code></dt>
<dd>
<p>reflog identity email (respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%gs</em></dt>
+<dt class="hdlist1"><code>%gs</code></dt>
<dd>
<p>reflog subject</p>
</dd>
-<dt class="hdlist1"><em>%(trailers[:<options>])</em></dt>
+<dt class="hdlist1"><code>%</code>(<code>trailers</code>[<code>:</code><em><option></em><code>,..</code>.])</dt>
<dd>
<p>display the trailers of the body as interpreted by
<a href="git-interpret-trailers.html">git-interpret-trailers(1)</a>. The <code>trailers</code> string may be followed by
@@ -2619,43 +2640,43 @@
<div class="ulist">
<ul>
<li>
-<p><em>key=<key></em>: only show trailers with specified <key>. Matching is done
+<p><code>key=</code><em><key></em>: only show trailers with specified <key>. Matching is done
case-insensitively and trailing colon is optional. If option is
given multiple times trailer lines matching any of the keys are
shown. This option automatically enables the <code>only</code> option so that
non-trailer lines in the trailer block are hidden. If that is not
desired it can be disabled with <code>only=false</code>. E.g.,
-%(<code>trailers:key=Reviewed-by</code>) shows trailer lines with key
+<code>%</code>(<code>trailers:key=Reviewed-by</code>) shows trailer lines with key
<code>Reviewed-by</code>.</p>
</li>
<li>
-<p><em>only[=<bool>]</em>: select whether non-trailer lines from the trailer
+<p><code>only</code>[<code>=</code><em><bool></em>]: select whether non-trailer lines from the trailer
block should be included.</p>
</li>
<li>
-<p><em>separator=<sep></em>: specify the separator inserted between trailer
+<p><code>separator=</code><em><sep></em>: specify the separator inserted between trailer
lines. Defaults to a line feed character. The string <sep> may contain
the literal formatting codes described above. To use comma as
-separator one must use %x2C as it would otherwise be parsed as
-next option. E.g., %(<code>trailers:key=Ticket,separator=</code>%x2C )
+separator one must use <code>%x2C</code> as it would otherwise be parsed as
+next option. E.g., <code>%</code>(<code>trailers:key=Ticket,separator=%x2C</code> )
shows all trailer lines whose key is "Ticket" separated by a comma
and a space.</p>
</li>
<li>
-<p><em>unfold[=<bool>]</em>: make it behave as if interpret-trailer’s <code>--unfold</code>
+<p><code>unfold</code>[<code>=</code><em><bool></em>]: make it behave as if interpret-trailer’s <code>--unfold</code>
option was given. E.g.,
-%(<code>trailers:only,unfold=true</code>) unfolds and shows all trailer lines.</p>
+<code>%</code>(<code>trailers:only,unfold=true</code>) unfolds and shows all trailer lines.</p>
</li>
<li>
-<p><em>keyonly[=<bool>]</em>: only show the key part of the trailer.</p>
+<p><code>keyonly</code>[<code>=</code><em><bool></em>]: only show the key part of the trailer.</p>
</li>
<li>
-<p><em>valueonly[=<bool>]</em>: only show the value part of the trailer.</p>
+<p><code>valueonly</code>[<code>=</code><em><bool></em>]: only show the value part of the trailer.</p>
</li>
<li>
-<p><em>key_value_separator=<sep></em>: specify the separator inserted between
+<p><code>key_value_separator=</code><em><sep></em>: specify the separator inserted between
the key and value of each trailer. Defaults to ": ". Otherwise it
-shares the same semantics as <em>separator=<sep></em> above.</p>
+shares the same semantics as <code>separator=</code><em><sep></em> above.</p>
</li>
</ul>
</div>
@@ -2673,9 +2694,9 @@
</td>
<td class="content">
Some placeholders may depend on other options given to the
-revision traversal engine. For example, the %g* reflog options will
+revision traversal engine. For example, the <code>%g*</code> reflog options will
insert an empty string unless we are traversing reflog entries (e.g., by
-<code>git</code> <code>log</code> <code>-g</code>). The %d and %D placeholders will use the "short"
+<code>git</code> <code>log</code> <code>-g</code>). The <code>%d</code> and <code>%D</code> placeholders will use the "short"
decoration format if <code>--decorate</code> was not already provided on the command
line.
</td>
@@ -2684,31 +2705,31 @@
</div>
<div class="paragraph">
<p>The boolean options accept an optional value [<code>=</code><em><bool-value></em>]. The
-values taken by <code>--type=bool</code> git-config[1], like <code>yes</code> and <code>off</code>,
+values taken by <code>--type=bool</code> <a href="git-config.html">git-config(1)</a>, like <code>yes</code> and <code>off</code>,
are all accepted. Giving a boolean option without <code>=</code><em><value></em> is
equivalent to giving it with <code>=true</code>.</p>
</div>
<div class="paragraph">
-<p>If you add a <code>+</code> (plus sign) after <em>%</em> of a placeholder, a line-feed
+<p>If you add a <code>+</code> (plus sign) after <code>%</code> of a placeholder, a line-feed
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.</p>
</div>
<div class="paragraph">
-<p>If you add a <code>-</code> (minus sign) after <em>%</em> of a placeholder, all consecutive
+<p>If you add a <code>-</code> (minus sign) after <code>%</code> of a placeholder, all consecutive
line-feeds immediately preceding the expansion are deleted if and only if the
placeholder expands to an empty string.</p>
</div>
<div class="paragraph">
-<p>If you add a ` ` (space) after <em>%</em> of a placeholder, a space
+<p>If you add a ' ' (space) after <code>%</code> of a placeholder, a space
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.</p>
</div>
<div class="ulist">
<ul>
<li>
-<p><em>tformat:</em></p>
+<p><code>tformat:</code></p>
<div class="paragraph">
-<p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
+<p>The <code>tformat:</code> format works exactly like <code>format:</code>, except that it
provides "terminator" semantics instead of "separator" semantics. In
other words, each commit has the message terminator character (usually a
newline) appended, rather than a separator placed between entries.
@@ -2730,7 +2751,7 @@
</div>
</div>
<div class="paragraph">
-<p>In addition, any unrecognized string that has a % in it is interpreted
+<p>In addition, any unrecognized string that has a <code>%</code> in it is interpreted
as if it has <code>tformat:</code> in front of it. For example, these two are
equivalent:</p>
</div>
@@ -2776,38 +2797,38 @@
squelch their output, or to cancel the effect of options like
<code>--patch</code>, <code>--stat</code> earlier on the command line in an alias.</p>
</dd>
-<dt class="hdlist1">-m</dt>
+<dt class="hdlist1"><code>-m</code></dt>
<dd>
<p>Show diffs for merge commits in the default format. This is
similar to <code>--diff-merges=on</code>, except <code>-m</code> will
produce no output unless <code>-p</code> is given as well.</p>
</dd>
-<dt class="hdlist1">-c</dt>
+<dt class="hdlist1"><code>-c</code></dt>
<dd>
<p>Produce combined diff output for merge commits.
Shortcut for <code>--diff-merges=combined</code> <code>-p</code>.</p>
</dd>
-<dt class="hdlist1">--cc</dt>
+<dt class="hdlist1"><code>--cc</code></dt>
<dd>
<p>Produce dense combined diff output for merge commits.
Shortcut for <code>--diff-merges=dense-combined</code> <code>-p</code>.</p>
</dd>
-<dt class="hdlist1">--dd</dt>
+<dt class="hdlist1"><code>--dd</code></dt>
<dd>
<p>Produce diff with respect to first parent for both merge and
regular commits.
Shortcut for <code>--diff-merges=first-parent</code> <code>-p</code>.</p>
</dd>
-<dt class="hdlist1">--remerge-diff</dt>
+<dt class="hdlist1"><code>--remerge-diff</code></dt>
<dd>
<p>Produce remerge-diff output for merge commits.
Shortcut for <code>--diff-merges=remerge</code> <code>-p</code>.</p>
</dd>
-<dt class="hdlist1">--no-diff-merges</dt>
+<dt class="hdlist1"><code>--no-diff-merges</code></dt>
<dd>
<p>Synonym for <code>--diff-merges=off</code>.</p>
</dd>
-<dt class="hdlist1">--diff-merges=<format></dt>
+<dt class="hdlist1"><code>--diff-merges=</code><em><format></em></dt>
<dd>
<p>Specify diff format to be used for merge commits. Default is
`off` unless <code>--first-parent</code> is in use, in
@@ -2819,60 +2840,66 @@
<div class="content">
<div class="dlist">
<dl>
-<dt class="hdlist1">off, none</dt>
+<dt class="hdlist1"><code>off</code></dt>
+<dt class="hdlist1"><code>none</code></dt>
<dd>
<p>Disable output of diffs for merge commits. Useful to override
implied value.</p>
</dd>
-<dt class="hdlist1">on, m</dt>
+<dt class="hdlist1"><code>on</code></dt>
+<dt class="hdlist1"><code>m</code></dt>
<dd>
<p>Make diff output for merge commits to be shown in the default
format. The default format can be changed using
<code>log.diffMerges</code> configuration variable, whose default value
is <code>separate</code>.</p>
</dd>
-<dt class="hdlist1">first-parent, 1</dt>
+<dt class="hdlist1"><code>first-parent</code></dt>
+<dt class="hdlist1"><code>1</code></dt>
<dd>
<p>Show full diff with respect to first parent. This is the same
format as <code>--patch</code> produces for non-merge commits.</p>
</dd>
-<dt class="hdlist1">separate</dt>
+<dt class="hdlist1"><code>separate</code></dt>
<dd>
<p>Show full diff with respect to each of parents.
Separate log entry and diff is generated for each parent.</p>
</dd>
-<dt class="hdlist1">combined, c</dt>
+<dt class="hdlist1"><code>combined</code></dt>
+<dt class="hdlist1"><code>c</code></dt>
<dd>
<p>Show differences from each of the parents to the merge
result simultaneously instead of showing pairwise diff between
a parent and the result one at a time. Furthermore, it lists
only files which were modified from all parents.</p>
</dd>
-<dt class="hdlist1">dense-combined, cc</dt>
+<dt class="hdlist1"><code>dense-combined</code></dt>
+<dt class="hdlist1"><code>cc</code></dt>
<dd>
<p>Further compress output produced by <code>--diff-merges=combined</code>
by omitting uninteresting hunks whose contents in the parents
have only two variants and the merge result picks one of them
without modification.</p>
</dd>
-<dt class="hdlist1">remerge, r</dt>
+<dt class="hdlist1"><code>remerge</code></dt>
+<dt class="hdlist1"><code>r</code></dt>
<dd>
<p>Remerge two-parent merge commits to create a temporary tree
object—​potentially containing files with conflict markers
and such. A diff is then shown between that temporary tree
and the actual merge commit.</p>
+</dd>
+</dl>
+</div>
+</div>
+</div>
<div class="paragraph">
<p>The output emitted when this option is used is subject to change, and
so is its interaction with other options (unless explicitly
documented).</p>
</div>
</dd>
-</dl>
-</div>
-</div>
-</div>
-</dd>
-<dt class="hdlist1">--combined-all-paths</dt>
+<dt class="hdlist1"><code>--combined-all-paths</code></dt>
<dd>
<p>Cause combined diffs (used for merge commits) to
list the name of the file from all parents. It thus only has
@@ -3400,7 +3427,7 @@
few lines that happen to match textually as the context, but as a
single deletion of everything old followed by a single insertion of
everything new, and the number <em><m></em> controls this aspect of the <code>-B</code>
-option (defaults to 60%). <code>-B/70</code>% specifies that less than 30% of the
+option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
original should remain in the result for Git to consider it a total
rewrite (i.e. otherwise the resulting patch will be a series of
deletion and insertion mixed together with context lines).</p>
@@ -3409,7 +3436,7 @@
<p>When used with <code>-M</code>, a totally-rewritten file is also considered as the
source of a rename (usually <code>-M</code> only considers a file that disappeared
as the source of a rename), and the number <em><n></em> controls this aspect of
-the <code>-B</code> option (defaults to 50%). <code>-B20</code>% specifies that a change with
+the <code>-B</code> option (defaults to 50%). <code>-B20%</code> specifies that a change with
addition and deletion compared to 20% or more of the file’s size are
eligible for being picked up as a possible source of a rename to
another file.</p>
@@ -3423,13 +3450,13 @@
<code>--follow</code>.
If <em><n></em> is specified, it is a threshold on the similarity
index (i.e. amount of addition/deletions compared to the
-file’s size). For example, <code>-M90</code>% means Git should consider a
+file’s size). For example, <code>-M90%</code> means Git should consider a
delete/add pair to be a rename if more than 90% of the file
-hasn’t changed. Without a % sign, the number is to be read as
+hasn’t changed. Without a <code>%</code> sign, the number is to be read as
a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
-0.5, and is thus the same as <code>-M50</code>%. Similarly, <code>-M05</code> is
-the same as <code>-M5</code>%. To limit detection to exact renames, use
-<code>-M100</code>%. The default similarity index is 50%.</p>
+0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is
+the same as <code>-M5%</code>. To limit detection to exact renames, use
+<code>-M100%</code>. The default similarity index is 50%.</p>
</dd>
<dt class="hdlist1"><code>-C</code>[<em><n></em>]</dt>
<dt class="hdlist1"><code>--find-copies</code>[<code>=</code><em><n></em>]</dt>
@@ -4055,14 +4082,14 @@
</dd>
<dt class="hdlist1"><code>git</code> <code>log</code> <code>--since=</code>"2 <code>weeks</code> <code>ago</code>" <code>--</code> <code>gitk</code></dt>
<dd>
-<p>Show the changes during the last two weeks to the file <em>gitk</em>.
+<p>Show the changes during the last two weeks to the file <code>gitk</code>.
The <code>--</code> is necessary to avoid confusion with the <strong>branch</strong> named
-<em>gitk</em></p>
+<code>gitk</code></p>
</dd>
<dt class="hdlist1"><code>git</code> <code>log</code> <code>--name-status</code> <code>release</code><code>..</code><code>test</code></dt>
<dd>
-<p>Show the commits that are in the "test" branch but not yet
-in the "release" branch, along with the list of paths
+<p>Show the commits that are in the "<code>test</code>" branch but not yet
+in the "<code>release</code>" branch, along with the list of paths
each commit modifies.</p>
</dd>
<dt class="hdlist1"><code>git</code> <code>log</code> <code>--follow</code> <code>builtin/rev-list.c</code></dt>
@@ -4074,7 +4101,7 @@
<dt class="hdlist1"><code>git</code> <code>log</code> <code>--branches</code> <code>--not</code> <code>--remotes=origin</code></dt>
<dd>
<p>Shows all commits that are in any of local branches but not in
-any of remote-tracking branches for <em>origin</em> (what you have that
+any of remote-tracking branches for <code>origin</code> (what you have that
origin doesn’t).</p>
</dd>
<dt class="hdlist1"><code>git</code> <code>log</code> <code>master</code> <code>--not</code> <code>--remotes=*/master</code></dt>
@@ -4209,12 +4236,12 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">format.pretty</dt>
+<dt class="hdlist1"><code>format.pretty</code></dt>
<dd>
<p>Default for the <code>--format</code> option. (See <em>Pretty Formats</em> above.)
Defaults to <code>medium</code>.</p>
</dd>
-<dt class="hdlist1">i18n.logOutputEncoding</dt>
+<dt class="hdlist1"><code>i18n.logOutputEncoding</code></dt>
<dd>
<p>Encoding to use when displaying logs. (See <em>Discussion</em> above.)
Defaults to the value of <code>i18n.commitEncoding</code> if set, and UTF-8
@@ -4229,18 +4256,18 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">log.abbrevCommit</dt>
+<dt class="hdlist1"><code>log.abbrevCommit</code></dt>
<dd>
-<p>If true, makes
+<p>If <code>true</code>, make
<a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
<a href="git-whatchanged.html">git-whatchanged(1)</a>
assume <code>--abbrev-commit</code>. You may
override this option with <code>--no-abbrev-commit</code>.</p>
</dd>
-<dt class="hdlist1">log.date</dt>
+<dt class="hdlist1"><code>log.date</code></dt>
<dd>
-<p>Set the default date-time mode for the <em>log</em> command.
-Setting a value for log.date is similar to using <em>git log</em>'s
+<p>Set the default date-time mode for the <code>log</code> command.
+Setting a value for log.date is similar to using <code>git</code> <code>log</code>'s
<code>--date</code> option. See <a href="git-log.html">git-log(1)</a> for details.</p>
<div class="paragraph">
<p>If the format is set to "auto:foo" and the pager is in use, format
@@ -4248,61 +4275,68 @@
be used.</p>
</div>
</dd>
-<dt class="hdlist1">log.decorate</dt>
+<dt class="hdlist1"><code>log.decorate</code></dt>
<dd>
<p>Print out the ref names of any commits that are shown by the log
-command. If <em>short</em> is specified, the ref name prefixes <em>refs/heads/</em>,
-<em>refs/tags/</em> and <em>refs/remotes/</em> will not be printed. If <em>full</em> is
-specified, the full ref name (including prefix) will be printed.
-If <em>auto</em> is specified, then if the output is going to a terminal,
-the ref names are shown as if <em>short</em> were given, otherwise no ref
-names are shown. This is the same as the <code>--decorate</code> option
-of the <code>git</code> <code>log</code>.</p>
+command. Possible values are:</p>
+<div class="listingblock">
+<div class="content">
+<pre>`short`;; the ref name prefixes `refs/heads/`, `refs/tags/` and
+ `refs/remotes/` are not printed.
+`full`;; the full ref name (including prefix) are printed.
+`auto`;; if the output is going to a terminal,
+ the ref names are shown as if `short` were given, otherwise no ref
+ names are shown.</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>This is the same as the <code>--decorate</code> option of the <code>git</code> <code>log</code>.</p>
+</div>
</dd>
-<dt class="hdlist1">log.initialDecorationSet</dt>
+<dt class="hdlist1"><code>log.initialDecorationSet</code></dt>
<dd>
<p>By default, <code>git</code> <code>log</code> only shows decorations for certain known ref
namespaces. If <em>all</em> is specified, then show all refs as
decorations.</p>
</dd>
-<dt class="hdlist1">log.excludeDecoration</dt>
+<dt class="hdlist1"><code>log.excludeDecoration</code></dt>
<dd>
<p>Exclude the specified patterns from the log decorations. This is
similar to the <code>--decorate-refs-exclude</code> command-line option, but
the config option can be overridden by the <code>--decorate-refs</code>
option.</p>
</dd>
-<dt class="hdlist1">log.diffMerges</dt>
+<dt class="hdlist1"><code>log.diffMerges</code></dt>
<dd>
<p>Set diff format to be used when <code>--diff-merges=on</code> is
specified, see <code>--diff-merges</code> in <a href="git-log.html">git-log(1)</a> for
details. Defaults to <code>separate</code>.</p>
</dd>
-<dt class="hdlist1">log.follow</dt>
+<dt class="hdlist1"><code>log.follow</code></dt>
<dd>
<p>If <code>true</code>, <code>git</code> <code>log</code> will act as if the <code>--follow</code> option was used when
a single <path> is given. This has the same limitations as <code>--follow</code>,
i.e. it cannot be used to follow multiple files and does not work well
on non-linear history.</p>
</dd>
-<dt class="hdlist1">log.graphColors</dt>
+<dt class="hdlist1"><code>log.graphColors</code></dt>
<dd>
<p>A list of colors, separated by commas, that can be used to draw
history lines in <code>git</code> <code>log</code> <code>--graph</code>.</p>
</dd>
-<dt class="hdlist1">log.showRoot</dt>
+<dt class="hdlist1"><code>log.showRoot</code></dt>
<dd>
<p>If true, the initial commit will be shown as a big creation event.
This is equivalent to a diff against an empty tree.
Tools like <a href="git-log.html">git-log(1)</a> or <a href="git-whatchanged.html">git-whatchanged(1)</a>, which
normally hide the root commit will now show it. True by default.</p>
</dd>
-<dt class="hdlist1">log.showSignature</dt>
+<dt class="hdlist1"><code>log.showSignature</code></dt>
<dd>
<p>If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
<a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--show-signature</code>.</p>
</dd>
-<dt class="hdlist1">log.mailmap</dt>
+<dt class="hdlist1"><code>log.mailmap</code></dt>
<dd>
<p>If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
<a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--use-mailmap</code>, otherwise
@@ -4407,7 +4441,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-06-20 18:10:42 -0700
+Last updated 2025-07-21 14:48:33 -0700
</div>
</div>
</body>
diff --git a/git-ls-files.html b/git-ls-files.html
index bded97b..485f117 100644
--- a/git-ls-files.html
+++ b/git-ls-files.html
@@ -733,10 +733,10 @@
</dd>
<dt class="hdlist1">--format=<format></dt>
<dd>
-<p>A string that interpolates %(<code>fieldname</code>) from the result being shown.
-It also interpolates %% to %, and %xXX where <code>XX</code> are hex digits
-interpolates to character with hex code <code>XX</code>; for example %x00
-interpolates to <code>\0</code> (NUL), %x09 to <code>\t</code> (TAB) and %x0a to <code>\n</code> (LF).
+<p>A string that interpolates <code>%</code>(<code>fieldname</code>) from the result being shown.
+It also interpolates <code>%%</code> to <code>%</code>, and <code>%xXX</code> where <code>XX</code> are hex digits
+interpolates to character with hex code <code>XX</code>; for example <code>%x00</code>
+interpolates to <code>\0</code> (NUL), <code>%x09</code> to <code>\t</code> (TAB) and %x0a to <code>\n</code> (LF).
--format cannot be combined with <code>-s</code>, <code>-o</code>, <code>-k</code>, <code>-t</code>, <code>--resolve-undo</code>
and <code>--eol</code>.</p>
</dd>
@@ -789,7 +789,7 @@
<div class="paragraph">
<p>It is possible to print in a custom format by using the <code>--format</code>
option, which is able to interpolate different fields using
-a %(<code>fieldname</code>) notation. For example, if you only care about the
+a <code>%</code>(<code>fieldname</code>) notation. For example, if you only care about the
"objectname" and "path" fields, you can execute with a specific
"--format" like</p>
</div>
@@ -934,7 +934,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/git-ls-tree.html b/git-ls-tree.html
index 6595b7e..fc0e38c 100644
--- a/git-ls-tree.html
+++ b/git-ls-tree.html
@@ -554,11 +554,11 @@
</dd>
<dt class="hdlist1">--format=<format></dt>
<dd>
-<p>A string that interpolates %(<code>fieldname</code>) from the result
-being shown. It also interpolates %% to %, and
-%xNN where <code>NN</code> are hex digits interpolates to character
-with hex code <code>NN</code>; for example %x00 interpolates to
-<code>\0</code> (NUL), %x09 to <code>\t</code> (TAB) and %x0a to <code>\n</code> (LF).
+<p>A string that interpolates <code>%</code>(<code>fieldname</code>) from the result
+being shown. It also interpolates <code>%%</code> to <code>%</code>, and
+<code>%xNN</code> where <code>NN</code> are hex digits interpolates to character
+with hex code <code>NN</code>; for example <code>%x00</code> interpolates to
+<code>\0</code> (NUL), <code>%x09</code> to <code>\t</code> (TAB) and <code>%x0a</code> to <code>\n</code> (LF).
When specified, <code>--format</code> cannot be combined with other
format-altering options, including <code>--long</code>, <code>--name-only</code>
and <code>--object-only</code>.</p>
@@ -624,7 +624,7 @@
</div>
<div class="paragraph">
<p>It is possible to print in a custom format by using the <code>--format</code> option,
-which is able to interpolate different fields using a %(<code>fieldname</code>) notation.
+which is able to interpolate different fields using a <code>%</code>(<code>fieldname</code>) notation.
For example, if you only care about the "objectname" and "path" fields, you
can execute with a specific "--format" like</p>
</div>
@@ -681,7 +681,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/git-pack-objects.adoc b/git-pack-objects.adoc
index b1c5aa2..eba014c 100644
--- a/git-pack-objects.adoc
+++ b/git-pack-objects.adoc
@@ -87,13 +87,21 @@
reference was included in the resulting packfile. This
can be useful to send new tags to native Git clients.
---stdin-packs::
+--stdin-packs[=<mode>]::
Read the basenames of packfiles (e.g., `pack-1234abcd.pack`)
from the standard input, instead of object names or revision
arguments. The resulting pack contains all objects listed in the
included packs (those not beginning with `^`), excluding any
objects listed in the excluded packs (beginning with `^`).
+
+When `mode` is "follow", objects from packs not listed on stdin receive
+special treatment. Objects within unlisted packs will be included if
+those objects are (1) reachable from the included packs, and (2) not
+found in any excluded packs. This mode is useful, for example, to
+resurrect once-unreachable objects found in cruft packs to generate
+packs which are closed under reachability up to the boundary set by the
+excluded packs.
++
Incompatible with `--revs`, or options that imply `--revs` (such as
`--all`), with the exception of `--unpacked`, which is compatible.
diff --git a/git-pack-objects.html b/git-pack-objects.html
index 0ccf464..463135b 100644
--- a/git-pack-objects.html
+++ b/git-pack-objects.html
@@ -547,7 +547,7 @@
reference was included in the resulting packfile. This
can be useful to send new tags to native Git clients.</p>
</dd>
-<dt class="hdlist1">--stdin-packs</dt>
+<dt class="hdlist1">--stdin-packs[=<mode>]</dt>
<dd>
<p>Read the basenames of packfiles (e.g., <code>pack-1234abcd.pack</code>)
from the standard input, instead of object names or revision
@@ -555,6 +555,15 @@
included packs (those not beginning with <code>^</code>), excluding any
objects listed in the excluded packs (beginning with <code>^</code>).</p>
<div class="paragraph">
+<p>When <code>mode</code> is "follow", objects from packs not listed on stdin receive
+special treatment. Objects within unlisted packs will be included if
+those objects are (1) reachable from the included packs, and (2) not
+found in any excluded packs. This mode is useful, for example, to
+resurrect once-unreachable objects found in cruft packs to generate
+packs which are closed under reachability up to the boundary set by the
+excluded packs.</p>
+</div>
+<div class="paragraph">
<p>Incompatible with <code>--revs</code>, or options that imply <code>--revs</code> (such as
<code>--all</code>), with the exception of <code>--unpacked</code>, which is compatible.</p>
</div>
@@ -1040,7 +1049,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-06-18 14:54:41 -0700
+Last updated 2025-07-21 14:48:33 -0700
</div>
</div>
</body>
diff --git a/git-rebase.html b/git-rebase.html
index 1a03368..9da4b56 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -2206,7 +2206,7 @@
<p>In the following example, the developer works on a topic branch that
refactors the way buttons are defined, and on another topic branch
that uses that refactoring to implement a "Report a bug" button. The
-output of <code>git</code> <code>log</code> <code>--graph</code> <code>--format=</code>%s <code>-5</code> may look like this:</p>
+output of <code>git</code> <code>log</code> <code>--graph</code> <code>--format=%s</code> <code>-5</code> may look like this:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -2480,7 +2480,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-03-26 00:41:02 -0700
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/git-receive-pack.html b/git-receive-pack.html
index 622cf91..649c299 100644
--- a/git-receive-pack.html
+++ b/git-receive-pack.html
@@ -565,7 +565,7 @@
<dt class="hdlist1"><code>GIT_PUSH_CERT_STATUS</code></dt>
<dd>
<p>The status of GPG verification of the push certificate,
-using the same mnemonic as used in %G? format of <code>git</code> <code>log</code>
+using the same mnemonic as used in <code>%G</code>? format of <code>git</code> <code>log</code>
family of commands (see <a href="git-log.html">git-log(1)</a>).</p>
</dd>
<dt class="hdlist1"><code>GIT_PUSH_CERT_NONCE</code></dt>
@@ -822,7 +822,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-05-28 08:53:43 -0700
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/git-replay.html b/git-replay.html
index 8a6d8be..369578c 100644
--- a/git-replay.html
+++ b/git-replay.html
@@ -526,96 +526,96 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">-<number></dt>
-<dt class="hdlist1">-n <number></dt>
-<dt class="hdlist1">--max-count=<number></dt>
+<dt class="hdlist1"><code>-</code><em><number></em></dt>
+<dt class="hdlist1"><code>-n</code> <em><number></em></dt>
+<dt class="hdlist1"><code>--max-count=</code><em><number></em></dt>
<dd>
-<p>Limit the number of commits to output.</p>
+<p>Limit the output to <em><number></em> commits.</p>
</dd>
-<dt class="hdlist1">--skip=<number></dt>
+<dt class="hdlist1"><code>--skip=</code><em><number></em></dt>
<dd>
-<p>Skip <em>number</em> commits before starting to show the commit output.</p>
+<p>Skip <em><number></em> commits before starting to show the commit output.</p>
</dd>
-<dt class="hdlist1">--since=<date></dt>
-<dt class="hdlist1">--after=<date></dt>
+<dt class="hdlist1"><code>--since=</code><em><date></em></dt>
+<dt class="hdlist1"><code>--after=</code><em><date></em></dt>
<dd>
-<p>Show commits more recent than a specific date.</p>
+<p>Show commits more recent than <em><date></em>.</p>
</dd>
-<dt class="hdlist1">--since-as-filter=<date></dt>
+<dt class="hdlist1"><code>--since-as-filter=</code><em><date></em></dt>
<dd>
-<p>Show all commits more recent than a specific date. This visits
+<p>Show all commits more recent than <em><date></em>. This visits
all commits in the range, rather than stopping at the first commit which
-is older than a specific date.</p>
+is older than <em><date></em>.</p>
</dd>
-<dt class="hdlist1">--until=<date></dt>
-<dt class="hdlist1">--before=<date></dt>
+<dt class="hdlist1"><code>--until=</code><em><date></em></dt>
+<dt class="hdlist1"><code>--before=</code><em><date></em></dt>
<dd>
-<p>Show commits older than a specific date.</p>
+<p>Show commits older than <em><date></em>.</p>
</dd>
-<dt class="hdlist1">--author=<pattern></dt>
-<dt class="hdlist1">--committer=<pattern></dt>
+<dt class="hdlist1"><code>--author=</code><em><pattern></em></dt>
+<dt class="hdlist1"><code>--committer=</code><em><pattern></em></dt>
<dd>
<p>Limit the commits output to ones with author/committer
-header lines that match the specified pattern (regular
-expression). With more than one <code>--author=</code><em><pattern></em>,
-commits whose author matches any of the given patterns are
+header lines that match the <em><pattern></em> regular
+expression. With more than one <code>--author=</code><em><pattern></em>,
+commits whose author matches any of the <em><pattern></em> are
chosen (similarly for multiple <code>--committer=</code><em><pattern></em>).</p>
</dd>
-<dt class="hdlist1">--grep-reflog=<pattern></dt>
+<dt class="hdlist1"><code>--grep-reflog=</code><em><pattern></em></dt>
<dd>
<p>Limit the commits output to ones with reflog entries that
-match the specified pattern (regular expression). With
+match the <em><pattern></em> regular expression. With
more than one <code>--grep-reflog</code>, commits whose reflog message
matches any of the given patterns are chosen. It is an
error to use this option unless <code>--walk-reflogs</code> is in use.</p>
</dd>
-<dt class="hdlist1">--grep=<pattern></dt>
+<dt class="hdlist1"><code>--grep=</code><em><pattern></em></dt>
<dd>
<p>Limit the commits output to ones with a log message that
-matches the specified pattern (regular expression). With
+matches the <em><pattern></em> regular expression. With
more than one <code>--grep=</code><em><pattern></em>, commits whose message
-matches any of the given patterns are chosen (but see
+matches any of the <em><pattern></em> are chosen (but see
<code>--all-match</code>).</p>
<div class="paragraph">
<p>When <code>--notes</code> is in effect, the message from the notes is
matched as if it were part of the log message.</p>
</div>
</dd>
-<dt class="hdlist1">--all-match</dt>
+<dt class="hdlist1"><code>--all-match</code></dt>
<dd>
<p>Limit the commits output to ones that match all given <code>--grep</code>,
instead of ones that match at least one.</p>
</dd>
-<dt class="hdlist1">--invert-grep</dt>
+<dt class="hdlist1"><code>--invert-grep</code></dt>
<dd>
<p>Limit the commits output to ones with a log message that do not
-match the pattern specified with <code>--grep=</code><em><pattern></em>.</p>
+match the <em><pattern></em> specified with <code>--grep=</code><em><pattern></em>.</p>
</dd>
-<dt class="hdlist1">-i</dt>
-<dt class="hdlist1">--regexp-ignore-case</dt>
+<dt class="hdlist1"><code>-i</code></dt>
+<dt class="hdlist1"><code>--regexp-ignore-case</code></dt>
<dd>
<p>Match the regular expression limiting patterns without regard to letter
case.</p>
</dd>
-<dt class="hdlist1">--basic-regexp</dt>
+<dt class="hdlist1"><code>--basic-regexp</code></dt>
<dd>
<p>Consider the limiting patterns to be basic regular expressions;
this is the default.</p>
</dd>
-<dt class="hdlist1">-E</dt>
-<dt class="hdlist1">--extended-regexp</dt>
+<dt class="hdlist1"><code>-E</code></dt>
+<dt class="hdlist1"><code>--extended-regexp</code></dt>
<dd>
<p>Consider the limiting patterns to be extended regular expressions
instead of the default basic regular expressions.</p>
</dd>
-<dt class="hdlist1">-F</dt>
-<dt class="hdlist1">--fixed-strings</dt>
+<dt class="hdlist1"><code>-F</code></dt>
+<dt class="hdlist1"><code>--fixed-strings</code></dt>
<dd>
<p>Consider the limiting patterns to be fixed strings (don’t interpret
pattern as a regular expression).</p>
</dd>
-<dt class="hdlist1">-P</dt>
-<dt class="hdlist1">--perl-regexp</dt>
+<dt class="hdlist1"><code>-P</code></dt>
+<dt class="hdlist1"><code>--perl-regexp</code></dt>
<dd>
<p>Consider the limiting patterns to be Perl-compatible regular
expressions.</p>
@@ -625,23 +625,23 @@
providing this option will cause it to die.</p>
</div>
</dd>
-<dt class="hdlist1">--remove-empty</dt>
+<dt class="hdlist1"><code>--remove-empty</code></dt>
<dd>
<p>Stop when a given path disappears from the tree.</p>
</dd>
-<dt class="hdlist1">--merges</dt>
+<dt class="hdlist1"><code>--merges</code></dt>
<dd>
<p>Print only merge commits. This is exactly the same as <code>--min-parents=2</code>.</p>
</dd>
-<dt class="hdlist1">--no-merges</dt>
+<dt class="hdlist1"><code>--no-merges</code></dt>
<dd>
<p>Do not print commits with more than one parent. This is
exactly the same as <code>--max-parents=1</code>.</p>
</dd>
-<dt class="hdlist1">--min-parents=<number></dt>
-<dt class="hdlist1">--max-parents=<number></dt>
-<dt class="hdlist1">--no-min-parents</dt>
-<dt class="hdlist1">--no-max-parents</dt>
+<dt class="hdlist1"><code>--min-parents=</code><em><number></em></dt>
+<dt class="hdlist1"><code>--max-parents=</code><em><number></em></dt>
+<dt class="hdlist1"><code>--no-min-parents</code></dt>
+<dt class="hdlist1"><code>--no-max-parents</code></dt>
<dd>
<p>Show only commits which have at least (or at most) that many parent
commits. In particular, <code>--max-parents=1</code> is the same as <code>--no-merges</code>,
@@ -653,7 +653,7 @@
parents) and <code>--max-parents=-1</code> (negative numbers denote no upper limit).</p>
</div>
</dd>
-<dt class="hdlist1">--first-parent</dt>
+<dt class="hdlist1"><code>--first-parent</code></dt>
<dd>
<p>When finding commits to include, follow only the first
parent commit upon seeing a merge commit. This option
@@ -664,7 +664,7 @@
the individual commits brought in to your history by such
a merge.</p>
</dd>
-<dt class="hdlist1">--exclude-first-parent-only</dt>
+<dt class="hdlist1"><code>--exclude-first-parent-only</code></dt>
<dd>
<p>When finding commits to exclude (with a <em>^</em>), follow only
the first parent commit upon seeing a merge commit.
@@ -672,7 +672,7 @@
from the point where it diverged from the remote branch, given
that arbitrary merges can be valid topic branch changes.</p>
</dd>
-<dt class="hdlist1">--not</dt>
+<dt class="hdlist1"><code>--not</code></dt>
<dd>
<p>Reverses the meaning of the <em>^</em> prefix (or lack thereof)
for all following revision specifiers, up to the next <code>--not</code>.
@@ -681,40 +681,40 @@
via standard input, the revisions passed on the command line will
not be affected by it.</p>
</dd>
-<dt class="hdlist1">--all</dt>
+<dt class="hdlist1"><code>--all</code></dt>
<dd>
<p>Pretend as if all the refs in <code>refs/</code>, along with <code>HEAD</code>, are
listed on the command line as <em><commit></em>.</p>
</dd>
-<dt class="hdlist1">--branches[=<pattern>]</dt>
+<dt class="hdlist1"><code>--branches</code>[<code>=</code><em><pattern></em>]</dt>
<dd>
<p>Pretend as if all the refs in <code>refs/heads</code> are listed
on the command line as <em><commit></em>. If <em><pattern></em> is given, limit
-branches to ones matching given shell glob. If pattern lacks <em>?</em>,
+branches to ones matching given shell glob. If <em><pattern></em> lacks <em>?</em>,
<em>*</em>, or <em>[</em>, <em>/*</em> at the end is implied.</p>
</dd>
-<dt class="hdlist1">--tags[=<pattern>]</dt>
+<dt class="hdlist1"><code>--tags</code>[<code>=</code><em><pattern></em>]</dt>
<dd>
<p>Pretend as if all the refs in <code>refs/tags</code> are listed
on the command line as <em><commit></em>. If <em><pattern></em> is given, limit
tags to ones matching given shell glob. If pattern lacks <em>?</em>, <em>*</em>,
or <em>[</em>, <em>/*</em> at the end is implied.</p>
</dd>
-<dt class="hdlist1">--remotes[=<pattern>]</dt>
+<dt class="hdlist1"><code>--remotes</code>[<code>=</code><em><pattern></em>]</dt>
<dd>
<p>Pretend as if all the refs in <code>refs/remotes</code> are listed
on the command line as <em><commit></em>. If <em><pattern></em> is given, limit
remote-tracking branches to ones matching given shell glob.
If pattern lacks <em>?</em>, <em>*</em>, or <em>[</em>, <em>/*</em> at the end is implied.</p>
</dd>
-<dt class="hdlist1">--glob=<glob-pattern></dt>
+<dt class="hdlist1"><code>--glob=</code><em><glob-pattern></em></dt>
<dd>
<p>Pretend as if all the refs matching shell glob <em><glob-pattern></em>
are listed on the command line as <em><commit></em>. Leading <em>refs/</em>,
is automatically prepended if missing. If pattern lacks <em>?</em>, <em>*</em>,
or <em>[</em>, <em>/*</em> at the end is implied.</p>
</dd>
-<dt class="hdlist1">--exclude=<glob-pattern></dt>
+<dt class="hdlist1"><code>--exclude=</code><em><glob-pattern></em></dt>
<dd>
<p>Do not include refs matching <em><glob-pattern></em> that the next <code>--all</code>,
<code>--branches</code>, <code>--tags</code>, <code>--remotes</code>, or <code>--glob</code> would otherwise
@@ -730,7 +730,7 @@
explicitly.</p>
</div>
</dd>
-<dt class="hdlist1">--exclude-hidden=[fetch|receive|uploadpack]</dt>
+<dt class="hdlist1"><code>--exclude-hidden=</code>(<code>fetch</code>|<code>receive</code>|<code>uploadpack</code>)</dt>
<dd>
<p>Do not include refs that would be hidden by <code>git-fetch</code>,
<code>git-receive-pack</code> or <code>git-upload-pack</code> by consulting the appropriate
@@ -739,12 +739,12 @@
<a href="git-config.html">git-config(1)</a>). This option affects the next pseudo-ref option
<code>--all</code> or <code>--glob</code> and is cleared after processing them.</p>
</dd>
-<dt class="hdlist1">--reflog</dt>
+<dt class="hdlist1"><code>--reflog</code></dt>
<dd>
<p>Pretend as if all objects mentioned by reflogs are listed on the
command line as <em><commit></em>.</p>
</dd>
-<dt class="hdlist1">--alternate-refs</dt>
+<dt class="hdlist1"><code>--alternate-refs</code></dt>
<dd>
<p>Pretend as if all objects mentioned as ref tips of alternate
repositories were listed on the command line. An alternate
@@ -753,7 +753,7 @@
be modified by <code>core.alternateRefsCommand</code>, etc. See
<a href="git-config.html">git-config(1)</a>.</p>
</dd>
-<dt class="hdlist1">--single-worktree</dt>
+<dt class="hdlist1"><code>--single-worktree</code></dt>
<dd>
<p>By default, all working trees will be examined by the
following options when there are more than one (see
@@ -762,19 +762,19 @@
This option forces them to examine the current working tree
only.</p>
</dd>
-<dt class="hdlist1">--ignore-missing</dt>
+<dt class="hdlist1"><code>--ignore-missing</code></dt>
<dd>
<p>Upon seeing an invalid object name in the input, pretend as if
the bad input was not given.</p>
</dd>
-<dt class="hdlist1">--bisect</dt>
+<dt class="hdlist1"><code>--bisect</code></dt>
<dd>
<p>Pretend as if the bad bisection ref <code>refs/bisect/bad</code>
was listed and as if it was followed by <code>--not</code> and the good
bisection refs <code>refs/bisect/good-*</code> on the command
line.</p>
</dd>
-<dt class="hdlist1">--stdin</dt>
+<dt class="hdlist1"><code>--stdin</code></dt>
<dd>
<p>In addition to getting arguments from the command line, read
them from standard input as well. This accepts commits and
@@ -784,12 +784,12 @@
are only respected for arguments passed in the same way and will not
influence any subsequent command line arguments.</p>
</dd>
-<dt class="hdlist1">--cherry-mark</dt>
+<dt class="hdlist1"><code>--cherry-mark</code></dt>
<dd>
<p>Like <code>--cherry-pick</code> (see below) but mark equivalent commits
with <code>=</code> rather than omitting them, and inequivalent ones with <code>+</code>.</p>
</dd>
-<dt class="hdlist1">--cherry-pick</dt>
+<dt class="hdlist1"><code>--cherry-pick</code></dt>
<dd>
<p>Omit any commit that introduces the same change as
another commit on the “other side” when the set of
@@ -804,8 +804,8 @@
excluded from the output.</p>
</div>
</dd>
-<dt class="hdlist1">--left-only</dt>
-<dt class="hdlist1">--right-only</dt>
+<dt class="hdlist1"><code>--left-only</code></dt>
+<dt class="hdlist1"><code>--right-only</code></dt>
<dd>
<p>List only commits on the respective side of a symmetric difference,
i.e. only those which would be marked < resp. > by
@@ -818,7 +818,7 @@
list.</p>
</div>
</dd>
-<dt class="hdlist1">--cherry</dt>
+<dt class="hdlist1"><code>--cherry</code></dt>
<dd>
<p>A synonym for <code>--right-only</code> <code>--cherry-mark</code> <code>--no-merges</code>; useful to
limit the output to the commits on our side and mark those that
@@ -826,14 +826,14 @@
<code>git</code> <code>log</code> <code>--cherry</code> <code>upstream</code><code>...</code><code>mybranch</code>, similar to
<code>git</code> <code>cherry</code> <code>upstream</code> <code>mybranch</code>.</p>
</dd>
-<dt class="hdlist1">-g</dt>
-<dt class="hdlist1">--walk-reflogs</dt>
+<dt class="hdlist1"><code>-g</code></dt>
+<dt class="hdlist1"><code>--walk-reflogs</code></dt>
<dd>
<p>Instead of walking the commit ancestry chain, walk
reflog entries from the most recent one to older ones.
When this option is used you cannot specify commits to
-exclude (that is, <em>^commit</em>, <em>commit1..commit2</em>,
-and <em>commit1...commit2</em> notations cannot be used).</p>
+exclude (that is, <code>^</code><em><commit></em>, <em><commit1></em><code>..</code><em><commit2></em>,
+and <em><commit1></em><code>...</code><em><commit2></em> notations cannot be used).</p>
<div class="paragraph">
<p>With <code>--pretty</code> format other than <code>oneline</code> and <code>reference</code> (for obvious reasons),
this causes the output to have two extra lines of information
@@ -875,7 +875,7 @@
<p>Under <code>--pretty=reference</code>, this information will not be shown at all.</p>
</div>
</dd>
-<dt class="hdlist1">--merge</dt>
+<dt class="hdlist1"><code>--merge</code></dt>
<dd>
<p>Show commits touching conflicted paths in the range <code>HEAD</code><code>...</code><em><other></em>,
where <em><other></em> is the first existing pseudoref in <code>MERGE_HEAD</code>,
@@ -883,7 +883,7 @@
when the index has unmerged entries. This option can be used to show
relevant commits when resolving conflicts from a 3-way merge.</p>
</dd>
-<dt class="hdlist1">--boundary</dt>
+<dt class="hdlist1"><code>--boundary</code></dt>
<dd>
<p>Output excluded boundary commits. Boundary commits are
prefixed with <code>-</code>.</p>
@@ -904,11 +904,11 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1"><paths></dt>
+<dt class="hdlist1"><em><paths></em></dt>
<dd>
<p>Commits modifying the given <paths> are selected.</p>
</dd>
-<dt class="hdlist1">--simplify-by-decoration</dt>
+<dt class="hdlist1"><code>--simplify-by-decoration</code></dt>
<dd>
<p>Commits that are referred by some branch or tag are selected.</p>
</dd>
@@ -922,47 +922,47 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">Default mode</dt>
+<dt class="hdlist1"><code>Default</code> <code>mode</code></dt>
<dd>
<p>Simplifies the history to the simplest history explaining the
final state of the tree. Simplest because it prunes some side
branches if the end result is the same (i.e. merging branches
with the same content)</p>
</dd>
-<dt class="hdlist1">--show-pulls</dt>
+<dt class="hdlist1"><code>--show-pulls</code></dt>
<dd>
<p>Include all commits from the default mode, but also any merge
commits that are not TREESAME to the first parent but are
TREESAME to a later parent. This mode is helpful for showing
the merge commits that "first introduced" a change to a branch.</p>
</dd>
-<dt class="hdlist1">--full-history</dt>
+<dt class="hdlist1"><code>--full-history</code></dt>
<dd>
<p>Same as the default mode, but does not prune some history.</p>
</dd>
-<dt class="hdlist1">--dense</dt>
+<dt class="hdlist1"><code>--dense</code></dt>
<dd>
<p>Only the selected commits are shown, plus some to have a
meaningful history.</p>
</dd>
-<dt class="hdlist1">--sparse</dt>
+<dt class="hdlist1"><code>--sparse</code></dt>
<dd>
<p>All commits in the simplified history are shown.</p>
</dd>
-<dt class="hdlist1">--simplify-merges</dt>
+<dt class="hdlist1"><code>--simplify-merges</code></dt>
<dd>
<p>Additional option to <code>--full-history</code> to remove some needless
merges from the resulting history, as there are no selected
commits contributing to this merge.</p>
</dd>
-<dt class="hdlist1">--ancestry-path[=<commit>]</dt>
+<dt class="hdlist1"><code>--ancestry-path</code>[<code>=</code><em><commit></em>]</dt>
<dd>
-<p>When given a range of commits to display (e.g. <em>commit1..commit2</em>
-or <em>commit2 ^commit1</em>), and a commit <commit> in that range,
+<p>When given a range of commits to display (e.g. <em><commit1></em><code>..</code><em><commit2></em>
+or <em><commit2></em> <code>^</code><em><commit1></em>), and a commit <em><commit></em> in that range,
only display commits in that range
-that are ancestors of <commit>, descendants of <commit>, or
-<commit> itself. If no commit is specified, use <em>commit1</em> (the
-excluded part of the range) as <commit>. Can be passed multiple
+that are ancestors of <em><commit></em>, descendants of <em><commit></em>, or
+<em><commit></em> itself. If no commit is specified, use <em><commit1></em> (the
+excluded part of the range) as <em><commit></em>. Can be passed multiple
times; if so, a commit is included if it is any of the commits
given or if it is an ancestor or descendant of one of them.</p>
</dd>
@@ -972,7 +972,7 @@
<p>A more detailed explanation follows.</p>
</div>
<div class="paragraph">
-<p>Suppose you specified <code>foo</code> as the <paths>. We shall call commits
+<p>Suppose you specified <code>foo</code> as the <em><paths></em>. We shall call commits
that modify <code>foo</code> !TREESAME, and the rest TREESAME. (In a diff
filtered for <code>foo</code>, they look different and equal, respectively.)</p>
</div>
@@ -998,27 +998,27 @@
<ul>
<li>
<p><code>I</code> is the initial commit, in which <code>foo</code> exists with contents
-“asdf”, and a file <code>quux</code> exists with contents “quux”. Initial
+<code>asdf</code>, and a file <code>quux</code> exists with contents <code>quux</code>. Initial
commits are compared to an empty tree, so <code>I</code> is !TREESAME.</p>
</li>
<li>
-<p>In <code>A</code>, <code>foo</code> contains just “foo”.</p>
+<p>In <code>A</code>, <code>foo</code> contains just <code>foo</code>.</p>
</li>
<li>
<p><code>B</code> contains the same change as <code>A</code>. Its merge <code>M</code> is trivial and
hence TREESAME to all parents.</p>
</li>
<li>
-<p><code>C</code> does not change <code>foo</code>, but its merge <code>N</code> changes it to “foobar”,
+<p><code>C</code> does not change <code>foo</code>, but its merge <code>N</code> changes it to <code>foobar</code>,
so it is not TREESAME to any parent.</p>
</li>
<li>
-<p><code>D</code> sets <code>foo</code> to “baz”. Its merge <code>O</code> combines the strings from
-<code>N</code> and <code>D</code> to “foobarbaz”; i.e., it is not TREESAME to any parent.</p>
+<p><code>D</code> sets <code>foo</code> to <code>baz</code>. Its merge <code>O</code> combines the strings from
+<code>N</code> and <code>D</code> to <code>foobarbaz</code>; i.e., it is not TREESAME to any parent.</p>
</li>
<li>
-<p><code>E</code> changes <code>quux</code> to “xyzzy”, and its merge <code>P</code> combines the
-strings to “quux xyzzy”. <code>P</code> is TREESAME to <code>O</code>, but not to <code>E</code>.</p>
+<p><code>E</code> changes <code>quux</code> to <code>xyzzy</code>, and its merge <code>P</code> combines the
+strings to <code>quux</code> <code>xyzzy</code>. <code>P</code> is TREESAME to <code>O</code>, but not to <code>E</code>.</p>
</li>
<li>
<p><code>X</code> is an independent root commit that added a new file <code>side</code>, and <code>Y</code>
@@ -1065,7 +1065,7 @@
parent lines.</p>
</div>
</dd>
-<dt class="hdlist1">--full-history without parent rewriting</dt>
+<dt class="hdlist1"><code>--full-history</code> without parent rewriting</dt>
<dd>
<p>This mode differs from the default in one point: always follow
all parents of a merge, even if it is TREESAME to one of them.
@@ -1088,7 +1088,7 @@
them disconnected.</p>
</div>
</dd>
-<dt class="hdlist1">--full-history with parent rewriting</dt>
+<dt class="hdlist1"><code>--full-history</code> with parent rewriting</dt>
<dd>
<p>Ordinary commits are only included if they are !TREESAME
(though this can be changed, see <code>--sparse</code> below).</p>
@@ -1121,12 +1121,12 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--dense</dt>
+<dt class="hdlist1"><code>--dense</code></dt>
<dd>
<p>Commits that are walked are included if they are not TREESAME
to any parent.</p>
</dd>
-<dt class="hdlist1">--sparse</dt>
+<dt class="hdlist1"><code>--sparse</code></dt>
<dd>
<p>All commits that are walked are included.</p>
<div class="paragraph">
@@ -1135,7 +1135,7 @@
sides of the merge are never walked.</p>
</div>
</dd>
-<dt class="hdlist1">--simplify-merges</dt>
+<dt class="hdlist1"><code>--simplify-merges</code></dt>
<dd>
<p>First, build a history graph in the same way that
<code>--full-history</code> with parent rewriting does (see above).</p>
@@ -1210,10 +1210,10 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--ancestry-path[=<commit>]</dt>
+<dt class="hdlist1"><code>--ancestry-path</code>[<code>=</code><em><commit></em>]</dt>
<dd>
<p>Limit the displayed commits to those which are an ancestor of
-<commit>, or which are a descendant of <commit>, or are <commit>
+<em><commit></em>, or which are a descendant of <em><commit></em>, or are <em><commit></em>
itself.</p>
<div class="paragraph">
<p>As an example use case, consider the following commit history:</p>
@@ -1231,16 +1231,16 @@
<p>A regular <em>D..M</em> computes the set of commits that are ancestors of <code>M</code>,
but excludes the ones that are ancestors of <code>D</code>. This is useful to see
what happened to the history leading to <code>M</code> since <code>D</code>, in the sense
-that “what does <code>M</code> have that did not exist in <code>D</code>”. The result in this
+that "what does <code>M</code> have that did not exist in <code>D</code>". The result in this
example would be all the commits, except <code>A</code> and <code>B</code> (and <code>D</code> itself,
of course).</p>
</div>
<div class="paragraph">
<p>When we want to find out what commits in <code>M</code> are contaminated with the
bug introduced by <code>D</code> and need fixing, however, we might want to view
-only the subset of <em>D..M</em> that are actually descendants of <code>D</code>, i.e.
+only the subset of <code>D</code><code>..</code><code>M</code> that are actually descendants of <code>D</code>, i.e.
excluding <code>C</code> and <code>K</code>. This is exactly what the <code>--ancestry-path</code>
-option does. Applied to the <em>D..M</em> range, it results in:</p>
+option does. Applied to the <code>D</code><code>..</code><code>M</code> range, it results in:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -1253,7 +1253,7 @@
</div>
<div class="paragraph">
<p>We can also use <code>--ancestry-path=D</code> instead of <code>--ancestry-path</code> which
-means the same thing when applied to the <em>D..M</em> range but is just more
+means the same thing when applied to the <code>D</code><code>..</code><code>M</code> range but is just more
explicit.</p>
</div>
<div class="paragraph">
@@ -1391,7 +1391,7 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--show-pulls</dt>
+<dt class="hdlist1"><code>--show-pulls</code></dt>
<dd>
<p>In addition to the commits shown in the default history, show
each merge commit that is not TREESAME to its first parent but
@@ -1453,17 +1453,17 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--date-order</dt>
+<dt class="hdlist1"><code>--date-order</code></dt>
<dd>
<p>Show no parents before all of its children are shown, but
otherwise show commits in the commit timestamp order.</p>
</dd>
-<dt class="hdlist1">--author-date-order</dt>
+<dt class="hdlist1"><code>--author-date-order</code></dt>
<dd>
<p>Show no parents before all of its children are shown, but
otherwise show commits in the author timestamp order.</p>
</dd>
-<dt class="hdlist1">--topo-order</dt>
+<dt class="hdlist1"><code>--topo-order</code></dt>
<dd>
<p>Show no parents before all of its children are shown, and
avoid showing commits on multiple lines of history
@@ -1490,9 +1490,9 @@
together.</p>
</div>
</dd>
-<dt class="hdlist1">--reverse</dt>
+<dt class="hdlist1"><code>--reverse</code></dt>
<dd>
-<p>Output the commits chosen to be shown (see Commit Limiting
+<p>Output the commits chosen to be shown (see <em>Commit Limiting</em>
section above) in reverse order. Cannot be combined with
<code>--walk-reflogs</code>.</p>
</dd>
@@ -1506,7 +1506,7 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--no-walk[=(sorted|unsorted)]</dt>
+<dt class="hdlist1"><code>--no-walk</code>[<code>=</code>(<code>sorted</code>|<code>unsorted</code>)]</dt>
<dd>
<p>Only show the given commits, but do not traverse their ancestors.
This has no effect if a range is specified. If the argument
@@ -1516,7 +1516,7 @@
by commit time.
Cannot be combined with <code>--graph</code>.</p>
</dd>
-<dt class="hdlist1">--do-walk</dt>
+<dt class="hdlist1"><code>--do-walk</code></dt>
<dd>
<p>Overrides a previous <code>--no-walk</code>.</p>
</dd>
@@ -1527,47 +1527,56 @@
<h3 id="_commit_formatting">Commit Formatting</h3>
<div class="dlist">
<dl>
-<dt class="hdlist1">--pretty[=<format>]</dt>
-<dt class="hdlist1">--format=<format></dt>
+<dt class="hdlist1"><code>--pretty</code>[<code>=</code><em><format></em>]</dt>
+<dt class="hdlist1"><code>--format=</code><em><format></em></dt>
<dd>
<p>Pretty-print the contents of the commit logs in a given format,
-where <em><format></em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,
-<em>full</em>, <em>fuller</em>, <em>reference</em>, <em>email</em>, <em>raw</em>, <em>format:<string></em>
-and <em>tformat:<string></em>. When <em><format></em> is none of the above,
-and has <em>%placeholder</em> in it, it acts as if
-<em>--pretty=tformat:<format></em> were given.</p>
+where <em><format></em> can be one of <code>oneline</code>, <code>short</code>, <code>medium</code>,
+<code>full</code>, <code>fuller</code>, <code>reference</code>, <code>email</code>, <code>raw</code>, <code>format:</code><em><string></em>
+and <code>tformat:</code><em><string></em>. When <em><format></em> is none of the above,
+and has <code>%</code><em><placeholder></em> in it, it acts as if
+<code>--pretty=tformat:</code><em><format></em> were given.</p>
<div class="paragraph">
<p>See the "PRETTY FORMATS" section for some additional details for each
-format. When <em>=<format></em> part is omitted, it defaults to <em>medium</em>.</p>
+format. When <code>=</code><em><format></em> part is omitted, it defaults to <code>medium</code>.</p>
</div>
-<div class="paragraph">
-<p>Note: you can specify the default pretty format in the repository
-configuration (see <a href="git-config.html">git-config(1)</a>).</p>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+you can specify the default pretty format in the repository
+configuration (see <a href="git-config.html">git-config(1)</a>).
+</td>
+</tr>
+</table>
</div>
</dd>
-<dt class="hdlist1">--abbrev-commit</dt>
+<dt class="hdlist1"><code>--abbrev-commit</code></dt>
<dd>
<p>Instead of showing the full 40-byte hexadecimal commit object
name, show a prefix that names the object uniquely.
-"--abbrev=<n>" (which also modifies diff output, if it is displayed)
+<code>--abbrev=</code><em><n></em> (which also modifies diff output, if it is displayed)
option can be used to specify the minimum length of the prefix.</p>
<div class="paragraph">
-<p>This should make "--pretty=oneline" a whole lot more readable for
+<p>This should make <code>--pretty=oneline</code> a whole lot more readable for
people using 80-column terminals.</p>
</div>
</dd>
-<dt class="hdlist1">--no-abbrev-commit</dt>
+<dt class="hdlist1"><code>--no-abbrev-commit</code></dt>
<dd>
<p>Show the full 40-byte hexadecimal commit object name. This negates
<code>--abbrev-commit</code>, either explicit or implied by other options such
-as "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.</p>
+as <code>--oneline</code>. It also overrides the <code>log.abbrevCommit</code> variable.</p>
</dd>
-<dt class="hdlist1">--oneline</dt>
+<dt class="hdlist1"><code>--oneline</code></dt>
<dd>
-<p>This is a shorthand for "--pretty=oneline --abbrev-commit"
+<p>This is a shorthand for <code>--pretty=oneline</code> <code>--abbrev-commit</code>
used together.</p>
</dd>
-<dt class="hdlist1">--encoding=<encoding></dt>
+<dt class="hdlist1"><code>--encoding=</code><em><encoding></em></dt>
<dd>
<p>Commit objects record the character encoding used for the log message
in their encoding header; this option can be used to tell the
@@ -1580,9 +1589,9 @@
to convert the commit, we will quietly output the original
object verbatim.</p>
</dd>
-<dt class="hdlist1">--expand-tabs=<n></dt>
-<dt class="hdlist1">--expand-tabs</dt>
-<dt class="hdlist1">--no-expand-tabs</dt>
+<dt class="hdlist1"><code>--expand-tabs=</code><em><n></em></dt>
+<dt class="hdlist1"><code>--expand-tabs</code></dt>
+<dt class="hdlist1"><code>--no-expand-tabs</code></dt>
<dd>
<p>Perform a tab expansion (replace each tab with enough spaces
to fill to the next display column that is a multiple of <em><n></em>)
@@ -1592,11 +1601,11 @@
which disables tab expansion.</p>
<div class="paragraph">
<p>By default, tabs are expanded in pretty formats that indent the log
-message by 4 spaces (i.e. <em>medium</em>, which is the default, <em>full</em>,
-and <em>fuller</em>).</p>
+message by 4 spaces (i.e. <code>medium</code>, which is the default, <code>full</code>,
+and <code>fuller</code>).</p>
</div>
</dd>
-<dt class="hdlist1">--notes[=<ref>]</dt>
+<dt class="hdlist1"><code>--notes</code>[<code>=</code><em><ref></em>]</dt>
<dd>
<p>Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the
commit, when showing the commit log message. This is the default
@@ -1615,41 +1624,42 @@
<code>refs/notes/</code> is prefixed to form the full name of the ref.</p>
</div>
<div class="paragraph">
-<p>Multiple --notes options can be combined to control which notes are
-being displayed. Examples: "--notes=foo" will show only notes from
-"refs/notes/foo"; "--notes=foo --notes" will show both notes from
+<p>Multiple <code>--notes</code> options can be combined to control which notes are
+being displayed. Examples: "<code>--notes=foo</code>" will show only notes from
+<code>refs/notes/foo</code>; "<code>--notes=foo</code> <code>--notes</code>" will show both notes from
"refs/notes/foo" and from the default notes ref(s).</p>
</div>
</dd>
-<dt class="hdlist1">--no-notes</dt>
+<dt class="hdlist1"><code>--no-notes</code></dt>
<dd>
<p>Do not show notes. This negates the above <code>--notes</code> option, by
resetting the list of notes refs from which notes are shown.
Options are parsed in the order given on the command line, so e.g.
-"--notes --notes=foo --no-notes --notes=bar" will only show notes
-from "refs/notes/bar".</p>
+"<code>--notes</code> <code>--notes=foo</code> <code>--no-notes</code> <code>--notes=bar</code>" will only show notes
+from <code>refs/notes/bar</code>.</p>
</dd>
-<dt class="hdlist1">--show-notes-by-default</dt>
+<dt class="hdlist1"><code>--show-notes-by-default</code></dt>
<dd>
<p>Show the default notes unless options for displaying specific
notes are given.</p>
</dd>
-<dt class="hdlist1">--show-notes[=<ref>]</dt>
-<dt class="hdlist1">--[no-]standard-notes</dt>
+<dt class="hdlist1"><code>--show-notes</code>[<code>=</code><em><ref></em>]</dt>
+<dt class="hdlist1"><code>--standard-notes</code></dt>
+<dt class="hdlist1"><code>--no-standard-notes</code></dt>
<dd>
-<p>These options are deprecated. Use the above --notes/--no-notes
+<p>These options are deprecated. Use the above <code>--notes</code>/<code>--no-notes</code>
options instead.</p>
</dd>
-<dt class="hdlist1">--show-signature</dt>
+<dt class="hdlist1"><code>--show-signature</code></dt>
<dd>
<p>Check the validity of a signed commit object by passing the signature
to <code>gpg</code> <code>--verify</code> and show the output.</p>
</dd>
-<dt class="hdlist1">--relative-date</dt>
+<dt class="hdlist1"><code>--relative-date</code></dt>
<dd>
<p>Synonym for <code>--date=relative</code>.</p>
</dd>
-<dt class="hdlist1">--date=<format></dt>
+<dt class="hdlist1"><code>--date=</code><em><format></em></dt>
<dd>
<p>Only takes effect for dates shown in human-readable format, such
as when using <code>--pretty</code>. <code>log.date</code> config variable sets a default
@@ -1700,7 +1710,7 @@
00:00:00 UTC), followed by a space, and then the timezone as an offset
from UTC (a <code>+</code> or <code>-</code> with four digits; the first two are hours, and
the second two are minutes). I.e., as if the timestamp were formatted
-with <code>strftime</code>("%s %z")).
+with <code>strftime</code>("%s <code>%z</code>")).
Note that the <code>-local</code> option does not affect the seconds-since-epoch
value (which is always measured in UTC), but does switch the accompanying
timezone value.</p>
@@ -1719,12 +1729,12 @@
has no effect.</p>
</div>
<div class="paragraph">
-<p><code>--date=format:..</code>. feeds the format <code>...</code> to your system <code>strftime</code>,
-except for %s, %z, and %Z, which are handled internally.
-Use <code>--date=format:</code>%c to show the date in your system locale’s
-preferred format. See the <code>strftime</code> manual for a complete list of
+<p><code>--date=format:</code><em><format></em> feeds the <em><format></em> to your system <code>strftime</code>,
+except for <code>%s</code>, <code>%z</code>, and <code>%Z</code>, which are handled internally.
+Use <code>--date=format:%c</code> to show the date in your system locale’s
+preferred format. See the <code>strftime</code>(3) manual for a complete list of
format placeholders. When using <code>-local</code>, the correct syntax is
-<code>--date=format-local:..</code>..</p>
+<code>--date=format-local:</code><em><format></em>.</p>
</div>
<div class="paragraph">
<p><code>--date=default</code> is the default format, and is based on ctime(3)
@@ -1736,17 +1746,17 @@
</div>
</div>
</dd>
-<dt class="hdlist1">--parents</dt>
+<dt class="hdlist1"><code>--parents</code></dt>
<dd>
<p>Print also the parents of the commit (in the form "commit parent…​").
Also enables parent rewriting, see <em>History Simplification</em> above.</p>
</dd>
-<dt class="hdlist1">--children</dt>
+<dt class="hdlist1"><code>--children</code></dt>
<dd>
<p>Print also the children of the commit (in the form "commit child…​").
Also enables parent rewriting, see <em>History Simplification</em> above.</p>
</dd>
-<dt class="hdlist1">--left-right</dt>
+<dt class="hdlist1"><code>--left-right</code></dt>
<dd>
<p>Mark which side of a symmetric difference a commit is reachable from.
Commits from the left side are prefixed with < and those from
@@ -1780,7 +1790,7 @@
</div>
</div>
</dd>
-<dt class="hdlist1">--graph</dt>
+<dt class="hdlist1"><code>--graph</code></dt>
<dd>
<p>Draw a text-based graphical representation of the commit history
on the left hand side of the output. This may cause extra lines
@@ -1795,9 +1805,9 @@
<code>--date-order</code> option may also be specified.</p>
</div>
</dd>
-<dt class="hdlist1">--show-linear-break[=<barrier>]</dt>
+<dt class="hdlist1"><code>--show-linear-break</code>[<code>=</code><em><barrier></em>]</dt>
<dd>
-<p>When --graph is not used, all history branches are flattened
+<p>When <code>--graph</code> is not used, all history branches are flattened
which can make it hard to see that the two consecutive commits
do not belong to a linear branch. This option puts a barrier
in between them in that case. If <em><barrier></em> is specified, it
@@ -1912,7 +1922,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/git-rev-list.html b/git-rev-list.html
index 5ba9e82..a037a99 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -486,8 +486,8 @@
not from <em>baz</em>".</p>
</div>
<div class="paragraph">
-<p>A special notation "<em><commit1></em>..<em><commit2></em>" can be used as a
-short-hand for "^<em><commit1></em> <em><commit2></em>". For example, either of
+<p>A special notation "<em><commit1></em><code>..</code><em><commit2></em>" can be used as a
+short-hand for "<code>^</code><em><commit1></em> <em><commit2></em>". For example, either of
the following may be used interchangeably:</p>
</div>
<div class="listingblock">
@@ -497,7 +497,7 @@
</div>
</div>
<div class="paragraph">
-<p>Another special notation is "<em><commit1></em>…​<em><commit2></em>" which is useful
+<p>Another special notation is "<em><commit1></em><code>...</code><em><commit2></em>" which is useful
for merges. The resulting set of commits is the symmetric difference
between the two operands. The following two commands are equivalent:</p>
</div>
@@ -538,97 +538,97 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">-<number></dt>
-<dt class="hdlist1">-n <number></dt>
-<dt class="hdlist1">--max-count=<number></dt>
+<dt class="hdlist1"><code>-</code><em><number></em></dt>
+<dt class="hdlist1"><code>-n</code> <em><number></em></dt>
+<dt class="hdlist1"><code>--max-count=</code><em><number></em></dt>
<dd>
-<p>Limit the number of commits to output.</p>
+<p>Limit the output to <em><number></em> commits.</p>
</dd>
-<dt class="hdlist1">--skip=<number></dt>
+<dt class="hdlist1"><code>--skip=</code><em><number></em></dt>
<dd>
-<p>Skip <em>number</em> commits before starting to show the commit output.</p>
+<p>Skip <em><number></em> commits before starting to show the commit output.</p>
</dd>
-<dt class="hdlist1">--since=<date></dt>
-<dt class="hdlist1">--after=<date></dt>
+<dt class="hdlist1"><code>--since=</code><em><date></em></dt>
+<dt class="hdlist1"><code>--after=</code><em><date></em></dt>
<dd>
-<p>Show commits more recent than a specific date.</p>
+<p>Show commits more recent than <em><date></em>.</p>
</dd>
-<dt class="hdlist1">--since-as-filter=<date></dt>
+<dt class="hdlist1"><code>--since-as-filter=</code><em><date></em></dt>
<dd>
-<p>Show all commits more recent than a specific date. This visits
+<p>Show all commits more recent than <em><date></em>. This visits
all commits in the range, rather than stopping at the first commit which
-is older than a specific date.</p>
+is older than <em><date></em>.</p>
</dd>
-<dt class="hdlist1">--until=<date></dt>
-<dt class="hdlist1">--before=<date></dt>
+<dt class="hdlist1"><code>--until=</code><em><date></em></dt>
+<dt class="hdlist1"><code>--before=</code><em><date></em></dt>
<dd>
-<p>Show commits older than a specific date.</p>
+<p>Show commits older than <em><date></em>.</p>
</dd>
-<dt class="hdlist1">--max-age=<timestamp></dt>
-<dt class="hdlist1">--min-age=<timestamp></dt>
+<dt class="hdlist1"><code>--max-age=</code><em><timestamp></em></dt>
+<dt class="hdlist1"><code>--min-age=</code><em><timestamp></em></dt>
<dd>
<p>Limit the commits output to specified time range.</p>
</dd>
-<dt class="hdlist1">--author=<pattern></dt>
-<dt class="hdlist1">--committer=<pattern></dt>
+<dt class="hdlist1"><code>--author=</code><em><pattern></em></dt>
+<dt class="hdlist1"><code>--committer=</code><em><pattern></em></dt>
<dd>
<p>Limit the commits output to ones with author/committer
-header lines that match the specified pattern (regular
-expression). With more than one <code>--author=</code><em><pattern></em>,
-commits whose author matches any of the given patterns are
+header lines that match the <em><pattern></em> regular
+expression. With more than one <code>--author=</code><em><pattern></em>,
+commits whose author matches any of the <em><pattern></em> are
chosen (similarly for multiple <code>--committer=</code><em><pattern></em>).</p>
</dd>
-<dt class="hdlist1">--grep-reflog=<pattern></dt>
+<dt class="hdlist1"><code>--grep-reflog=</code><em><pattern></em></dt>
<dd>
<p>Limit the commits output to ones with reflog entries that
-match the specified pattern (regular expression). With
+match the <em><pattern></em> regular expression. With
more than one <code>--grep-reflog</code>, commits whose reflog message
matches any of the given patterns are chosen. It is an
error to use this option unless <code>--walk-reflogs</code> is in use.</p>
</dd>
-<dt class="hdlist1">--grep=<pattern></dt>
+<dt class="hdlist1"><code>--grep=</code><em><pattern></em></dt>
<dd>
<p>Limit the commits output to ones with a log message that
-matches the specified pattern (regular expression). With
+matches the <em><pattern></em> regular expression. With
more than one <code>--grep=</code><em><pattern></em>, commits whose message
-matches any of the given patterns are chosen (but see
+matches any of the <em><pattern></em> are chosen (but see
<code>--all-match</code>).</p>
</dd>
-<dt class="hdlist1">--all-match</dt>
+<dt class="hdlist1"><code>--all-match</code></dt>
<dd>
<p>Limit the commits output to ones that match all given <code>--grep</code>,
instead of ones that match at least one.</p>
</dd>
-<dt class="hdlist1">--invert-grep</dt>
+<dt class="hdlist1"><code>--invert-grep</code></dt>
<dd>
<p>Limit the commits output to ones with a log message that do not
-match the pattern specified with <code>--grep=</code><em><pattern></em>.</p>
+match the <em><pattern></em> specified with <code>--grep=</code><em><pattern></em>.</p>
</dd>
-<dt class="hdlist1">-i</dt>
-<dt class="hdlist1">--regexp-ignore-case</dt>
+<dt class="hdlist1"><code>-i</code></dt>
+<dt class="hdlist1"><code>--regexp-ignore-case</code></dt>
<dd>
<p>Match the regular expression limiting patterns without regard to letter
case.</p>
</dd>
-<dt class="hdlist1">--basic-regexp</dt>
+<dt class="hdlist1"><code>--basic-regexp</code></dt>
<dd>
<p>Consider the limiting patterns to be basic regular expressions;
this is the default.</p>
</dd>
-<dt class="hdlist1">-E</dt>
-<dt class="hdlist1">--extended-regexp</dt>
+<dt class="hdlist1"><code>-E</code></dt>
+<dt class="hdlist1"><code>--extended-regexp</code></dt>
<dd>
<p>Consider the limiting patterns to be extended regular expressions
instead of the default basic regular expressions.</p>
</dd>
-<dt class="hdlist1">-F</dt>
-<dt class="hdlist1">--fixed-strings</dt>
+<dt class="hdlist1"><code>-F</code></dt>
+<dt class="hdlist1"><code>--fixed-strings</code></dt>
<dd>
<p>Consider the limiting patterns to be fixed strings (don’t interpret
pattern as a regular expression).</p>
</dd>
-<dt class="hdlist1">-P</dt>
-<dt class="hdlist1">--perl-regexp</dt>
+<dt class="hdlist1"><code>-P</code></dt>
+<dt class="hdlist1"><code>--perl-regexp</code></dt>
<dd>
<p>Consider the limiting patterns to be Perl-compatible regular
expressions.</p>
@@ -638,23 +638,23 @@
providing this option will cause it to die.</p>
</div>
</dd>
-<dt class="hdlist1">--remove-empty</dt>
+<dt class="hdlist1"><code>--remove-empty</code></dt>
<dd>
<p>Stop when a given path disappears from the tree.</p>
</dd>
-<dt class="hdlist1">--merges</dt>
+<dt class="hdlist1"><code>--merges</code></dt>
<dd>
<p>Print only merge commits. This is exactly the same as <code>--min-parents=2</code>.</p>
</dd>
-<dt class="hdlist1">--no-merges</dt>
+<dt class="hdlist1"><code>--no-merges</code></dt>
<dd>
<p>Do not print commits with more than one parent. This is
exactly the same as <code>--max-parents=1</code>.</p>
</dd>
-<dt class="hdlist1">--min-parents=<number></dt>
-<dt class="hdlist1">--max-parents=<number></dt>
-<dt class="hdlist1">--no-min-parents</dt>
-<dt class="hdlist1">--no-max-parents</dt>
+<dt class="hdlist1"><code>--min-parents=</code><em><number></em></dt>
+<dt class="hdlist1"><code>--max-parents=</code><em><number></em></dt>
+<dt class="hdlist1"><code>--no-min-parents</code></dt>
+<dt class="hdlist1"><code>--no-max-parents</code></dt>
<dd>
<p>Show only commits which have at least (or at most) that many parent
commits. In particular, <code>--max-parents=1</code> is the same as <code>--no-merges</code>,
@@ -666,7 +666,7 @@
parents) and <code>--max-parents=-1</code> (negative numbers denote no upper limit).</p>
</div>
</dd>
-<dt class="hdlist1">--first-parent</dt>
+<dt class="hdlist1"><code>--first-parent</code></dt>
<dd>
<p>When finding commits to include, follow only the first
parent commit upon seeing a merge commit. This option
@@ -677,7 +677,7 @@
the individual commits brought in to your history by such
a merge.</p>
</dd>
-<dt class="hdlist1">--exclude-first-parent-only</dt>
+<dt class="hdlist1"><code>--exclude-first-parent-only</code></dt>
<dd>
<p>When finding commits to exclude (with a <em>^</em>), follow only
the first parent commit upon seeing a merge commit.
@@ -685,7 +685,7 @@
from the point where it diverged from the remote branch, given
that arbitrary merges can be valid topic branch changes.</p>
</dd>
-<dt class="hdlist1">--not</dt>
+<dt class="hdlist1"><code>--not</code></dt>
<dd>
<p>Reverses the meaning of the <em>^</em> prefix (or lack thereof)
for all following revision specifiers, up to the next <code>--not</code>.
@@ -694,40 +694,40 @@
via standard input, the revisions passed on the command line will
not be affected by it.</p>
</dd>
-<dt class="hdlist1">--all</dt>
+<dt class="hdlist1"><code>--all</code></dt>
<dd>
<p>Pretend as if all the refs in <code>refs/</code>, along with <code>HEAD</code>, are
listed on the command line as <em><commit></em>.</p>
</dd>
-<dt class="hdlist1">--branches[=<pattern>]</dt>
+<dt class="hdlist1"><code>--branches</code>[<code>=</code><em><pattern></em>]</dt>
<dd>
<p>Pretend as if all the refs in <code>refs/heads</code> are listed
on the command line as <em><commit></em>. If <em><pattern></em> is given, limit
-branches to ones matching given shell glob. If pattern lacks <em>?</em>,
+branches to ones matching given shell glob. If <em><pattern></em> lacks <em>?</em>,
<em>*</em>, or <em>[</em>, <em>/*</em> at the end is implied.</p>
</dd>
-<dt class="hdlist1">--tags[=<pattern>]</dt>
+<dt class="hdlist1"><code>--tags</code>[<code>=</code><em><pattern></em>]</dt>
<dd>
<p>Pretend as if all the refs in <code>refs/tags</code> are listed
on the command line as <em><commit></em>. If <em><pattern></em> is given, limit
tags to ones matching given shell glob. If pattern lacks <em>?</em>, <em>*</em>,
or <em>[</em>, <em>/*</em> at the end is implied.</p>
</dd>
-<dt class="hdlist1">--remotes[=<pattern>]</dt>
+<dt class="hdlist1"><code>--remotes</code>[<code>=</code><em><pattern></em>]</dt>
<dd>
<p>Pretend as if all the refs in <code>refs/remotes</code> are listed
on the command line as <em><commit></em>. If <em><pattern></em> is given, limit
remote-tracking branches to ones matching given shell glob.
If pattern lacks <em>?</em>, <em>*</em>, or <em>[</em>, <em>/*</em> at the end is implied.</p>
</dd>
-<dt class="hdlist1">--glob=<glob-pattern></dt>
+<dt class="hdlist1"><code>--glob=</code><em><glob-pattern></em></dt>
<dd>
<p>Pretend as if all the refs matching shell glob <em><glob-pattern></em>
are listed on the command line as <em><commit></em>. Leading <em>refs/</em>,
is automatically prepended if missing. If pattern lacks <em>?</em>, <em>*</em>,
or <em>[</em>, <em>/*</em> at the end is implied.</p>
</dd>
-<dt class="hdlist1">--exclude=<glob-pattern></dt>
+<dt class="hdlist1"><code>--exclude=</code><em><glob-pattern></em></dt>
<dd>
<p>Do not include refs matching <em><glob-pattern></em> that the next <code>--all</code>,
<code>--branches</code>, <code>--tags</code>, <code>--remotes</code>, or <code>--glob</code> would otherwise
@@ -743,7 +743,7 @@
explicitly.</p>
</div>
</dd>
-<dt class="hdlist1">--exclude-hidden=[fetch|receive|uploadpack]</dt>
+<dt class="hdlist1"><code>--exclude-hidden=</code>(<code>fetch</code>|<code>receive</code>|<code>uploadpack</code>)</dt>
<dd>
<p>Do not include refs that would be hidden by <code>git-fetch</code>,
<code>git-receive-pack</code> or <code>git-upload-pack</code> by consulting the appropriate
@@ -752,12 +752,12 @@
<a href="git-config.html">git-config(1)</a>). This option affects the next pseudo-ref option
<code>--all</code> or <code>--glob</code> and is cleared after processing them.</p>
</dd>
-<dt class="hdlist1">--reflog</dt>
+<dt class="hdlist1"><code>--reflog</code></dt>
<dd>
<p>Pretend as if all objects mentioned by reflogs are listed on the
command line as <em><commit></em>.</p>
</dd>
-<dt class="hdlist1">--alternate-refs</dt>
+<dt class="hdlist1"><code>--alternate-refs</code></dt>
<dd>
<p>Pretend as if all objects mentioned as ref tips of alternate
repositories were listed on the command line. An alternate
@@ -766,7 +766,7 @@
be modified by <code>core.alternateRefsCommand</code>, etc. See
<a href="git-config.html">git-config(1)</a>.</p>
</dd>
-<dt class="hdlist1">--single-worktree</dt>
+<dt class="hdlist1"><code>--single-worktree</code></dt>
<dd>
<p>By default, all working trees will be examined by the
following options when there are more than one (see
@@ -775,12 +775,12 @@
This option forces them to examine the current working tree
only.</p>
</dd>
-<dt class="hdlist1">--ignore-missing</dt>
+<dt class="hdlist1"><code>--ignore-missing</code></dt>
<dd>
<p>Upon seeing an invalid object name in the input, pretend as if
the bad input was not given.</p>
</dd>
-<dt class="hdlist1">--stdin</dt>
+<dt class="hdlist1"><code>--stdin</code></dt>
<dd>
<p>In addition to getting arguments from the command line, read
them from standard input as well. This accepts commits and
@@ -790,7 +790,7 @@
are only respected for arguments passed in the same way and will not
influence any subsequent command line arguments.</p>
</dd>
-<dt class="hdlist1">--quiet</dt>
+<dt class="hdlist1"><code>--quiet</code></dt>
<dd>
<p>Don’t print anything to standard output. This form
is primarily meant to allow the caller to
@@ -798,8 +798,8 @@
connected (or not). It is faster than redirecting stdout
to <code>/dev/null</code> as the output does not have to be formatted.</p>
</dd>
-<dt class="hdlist1">--disk-usage</dt>
-<dt class="hdlist1">--disk-usage=human</dt>
+<dt class="hdlist1"><code>--disk-usage</code></dt>
+<dt class="hdlist1"><code>--disk-usage=human</code></dt>
<dd>
<p>Suppress normal output; instead, print the sum of the bytes used
for on-disk storage by the selected commits or objects. This is
@@ -811,12 +811,12 @@
With the optional value <code>human</code>, on-disk storage size is shown
in human-readable string(e.g. 12.24 Kib, 3.50 Mib).</p>
</dd>
-<dt class="hdlist1">--cherry-mark</dt>
+<dt class="hdlist1"><code>--cherry-mark</code></dt>
<dd>
<p>Like <code>--cherry-pick</code> (see below) but mark equivalent commits
with <code>=</code> rather than omitting them, and inequivalent ones with <code>+</code>.</p>
</dd>
-<dt class="hdlist1">--cherry-pick</dt>
+<dt class="hdlist1"><code>--cherry-pick</code></dt>
<dd>
<p>Omit any commit that introduces the same change as
another commit on the “other side” when the set of
@@ -831,8 +831,8 @@
excluded from the output.</p>
</div>
</dd>
-<dt class="hdlist1">--left-only</dt>
-<dt class="hdlist1">--right-only</dt>
+<dt class="hdlist1"><code>--left-only</code></dt>
+<dt class="hdlist1"><code>--right-only</code></dt>
<dd>
<p>List only commits on the respective side of a symmetric difference,
i.e. only those which would be marked < resp. > by
@@ -845,7 +845,7 @@
list.</p>
</div>
</dd>
-<dt class="hdlist1">--cherry</dt>
+<dt class="hdlist1"><code>--cherry</code></dt>
<dd>
<p>A synonym for <code>--right-only</code> <code>--cherry-mark</code> <code>--no-merges</code>; useful to
limit the output to the commits on our side and mark those that
@@ -853,14 +853,14 @@
<code>git</code> <code>log</code> <code>--cherry</code> <code>upstream</code><code>...</code><code>mybranch</code>, similar to
<code>git</code> <code>cherry</code> <code>upstream</code> <code>mybranch</code>.</p>
</dd>
-<dt class="hdlist1">-g</dt>
-<dt class="hdlist1">--walk-reflogs</dt>
+<dt class="hdlist1"><code>-g</code></dt>
+<dt class="hdlist1"><code>--walk-reflogs</code></dt>
<dd>
<p>Instead of walking the commit ancestry chain, walk
reflog entries from the most recent one to older ones.
When this option is used you cannot specify commits to
-exclude (that is, <em>^commit</em>, <em>commit1..commit2</em>,
-and <em>commit1...commit2</em> notations cannot be used).</p>
+exclude (that is, <code>^</code><em><commit></em>, <em><commit1></em><code>..</code><em><commit2></em>,
+and <em><commit1></em><code>...</code><em><commit2></em> notations cannot be used).</p>
<div class="paragraph">
<p>With <code>--pretty</code> format other than <code>oneline</code> and <code>reference</code> (for obvious reasons),
this causes the output to have two extra lines of information
@@ -902,7 +902,7 @@
<p>Under <code>--pretty=reference</code>, this information will not be shown at all.</p>
</div>
</dd>
-<dt class="hdlist1">--merge</dt>
+<dt class="hdlist1"><code>--merge</code></dt>
<dd>
<p>Show commits touching conflicted paths in the range <code>HEAD</code><code>...</code><em><other></em>,
where <em><other></em> is the first existing pseudoref in <code>MERGE_HEAD</code>,
@@ -910,23 +910,23 @@
when the index has unmerged entries. This option can be used to show
relevant commits when resolving conflicts from a 3-way merge.</p>
</dd>
-<dt class="hdlist1">--boundary</dt>
+<dt class="hdlist1"><code>--boundary</code></dt>
<dd>
<p>Output excluded boundary commits. Boundary commits are
prefixed with <code>-</code>.</p>
</dd>
-<dt class="hdlist1">--use-bitmap-index</dt>
+<dt class="hdlist1"><code>--use-bitmap-index</code></dt>
<dd>
<p>Try to speed up the traversal using the pack bitmap index (if
one is available). Note that when traversing with <code>--objects</code>,
trees and blobs will not have their associated path printed.</p>
</dd>
-<dt class="hdlist1">--progress=<header></dt>
+<dt class="hdlist1"><code>--progress=</code><em><header></em></dt>
<dd>
<p>Show progress reports on stderr as objects are considered. The
<em><header></em> text will be printed with each progress update.</p>
</dd>
-<dt class="hdlist1">-z</dt>
+<dt class="hdlist1"><code>-z</code></dt>
<dd>
<p>Instead of being newline-delimited, each outputted object and its
accompanying metadata is delimited using NUL bytes. Output is printed
@@ -971,11 +971,11 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1"><paths></dt>
+<dt class="hdlist1"><em><paths></em></dt>
<dd>
<p>Commits modifying the given <paths> are selected.</p>
</dd>
-<dt class="hdlist1">--simplify-by-decoration</dt>
+<dt class="hdlist1"><code>--simplify-by-decoration</code></dt>
<dd>
<p>Commits that are referred by some branch or tag are selected.</p>
</dd>
@@ -989,47 +989,47 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">Default mode</dt>
+<dt class="hdlist1"><code>Default</code> <code>mode</code></dt>
<dd>
<p>Simplifies the history to the simplest history explaining the
final state of the tree. Simplest because it prunes some side
branches if the end result is the same (i.e. merging branches
with the same content)</p>
</dd>
-<dt class="hdlist1">--show-pulls</dt>
+<dt class="hdlist1"><code>--show-pulls</code></dt>
<dd>
<p>Include all commits from the default mode, but also any merge
commits that are not TREESAME to the first parent but are
TREESAME to a later parent. This mode is helpful for showing
the merge commits that "first introduced" a change to a branch.</p>
</dd>
-<dt class="hdlist1">--full-history</dt>
+<dt class="hdlist1"><code>--full-history</code></dt>
<dd>
<p>Same as the default mode, but does not prune some history.</p>
</dd>
-<dt class="hdlist1">--dense</dt>
+<dt class="hdlist1"><code>--dense</code></dt>
<dd>
<p>Only the selected commits are shown, plus some to have a
meaningful history.</p>
</dd>
-<dt class="hdlist1">--sparse</dt>
+<dt class="hdlist1"><code>--sparse</code></dt>
<dd>
<p>All commits in the simplified history are shown.</p>
</dd>
-<dt class="hdlist1">--simplify-merges</dt>
+<dt class="hdlist1"><code>--simplify-merges</code></dt>
<dd>
<p>Additional option to <code>--full-history</code> to remove some needless
merges from the resulting history, as there are no selected
commits contributing to this merge.</p>
</dd>
-<dt class="hdlist1">--ancestry-path[=<commit>]</dt>
+<dt class="hdlist1"><code>--ancestry-path</code>[<code>=</code><em><commit></em>]</dt>
<dd>
-<p>When given a range of commits to display (e.g. <em>commit1..commit2</em>
-or <em>commit2 ^commit1</em>), and a commit <commit> in that range,
+<p>When given a range of commits to display (e.g. <em><commit1></em><code>..</code><em><commit2></em>
+or <em><commit2></em> <code>^</code><em><commit1></em>), and a commit <em><commit></em> in that range,
only display commits in that range
-that are ancestors of <commit>, descendants of <commit>, or
-<commit> itself. If no commit is specified, use <em>commit1</em> (the
-excluded part of the range) as <commit>. Can be passed multiple
+that are ancestors of <em><commit></em>, descendants of <em><commit></em>, or
+<em><commit></em> itself. If no commit is specified, use <em><commit1></em> (the
+excluded part of the range) as <em><commit></em>. Can be passed multiple
times; if so, a commit is included if it is any of the commits
given or if it is an ancestor or descendant of one of them.</p>
</dd>
@@ -1039,7 +1039,7 @@
<p>A more detailed explanation follows.</p>
</div>
<div class="paragraph">
-<p>Suppose you specified <code>foo</code> as the <paths>. We shall call commits
+<p>Suppose you specified <code>foo</code> as the <em><paths></em>. We shall call commits
that modify <code>foo</code> !TREESAME, and the rest TREESAME. (In a diff
filtered for <code>foo</code>, they look different and equal, respectively.)</p>
</div>
@@ -1065,27 +1065,27 @@
<ul>
<li>
<p><code>I</code> is the initial commit, in which <code>foo</code> exists with contents
-“asdf”, and a file <code>quux</code> exists with contents “quux”. Initial
+<code>asdf</code>, and a file <code>quux</code> exists with contents <code>quux</code>. Initial
commits are compared to an empty tree, so <code>I</code> is !TREESAME.</p>
</li>
<li>
-<p>In <code>A</code>, <code>foo</code> contains just “foo”.</p>
+<p>In <code>A</code>, <code>foo</code> contains just <code>foo</code>.</p>
</li>
<li>
<p><code>B</code> contains the same change as <code>A</code>. Its merge <code>M</code> is trivial and
hence TREESAME to all parents.</p>
</li>
<li>
-<p><code>C</code> does not change <code>foo</code>, but its merge <code>N</code> changes it to “foobar”,
+<p><code>C</code> does not change <code>foo</code>, but its merge <code>N</code> changes it to <code>foobar</code>,
so it is not TREESAME to any parent.</p>
</li>
<li>
-<p><code>D</code> sets <code>foo</code> to “baz”. Its merge <code>O</code> combines the strings from
-<code>N</code> and <code>D</code> to “foobarbaz”; i.e., it is not TREESAME to any parent.</p>
+<p><code>D</code> sets <code>foo</code> to <code>baz</code>. Its merge <code>O</code> combines the strings from
+<code>N</code> and <code>D</code> to <code>foobarbaz</code>; i.e., it is not TREESAME to any parent.</p>
</li>
<li>
-<p><code>E</code> changes <code>quux</code> to “xyzzy”, and its merge <code>P</code> combines the
-strings to “quux xyzzy”. <code>P</code> is TREESAME to <code>O</code>, but not to <code>E</code>.</p>
+<p><code>E</code> changes <code>quux</code> to <code>xyzzy</code>, and its merge <code>P</code> combines the
+strings to <code>quux</code> <code>xyzzy</code>. <code>P</code> is TREESAME to <code>O</code>, but not to <code>E</code>.</p>
</li>
<li>
<p><code>X</code> is an independent root commit that added a new file <code>side</code>, and <code>Y</code>
@@ -1132,7 +1132,7 @@
parent lines.</p>
</div>
</dd>
-<dt class="hdlist1">--full-history without parent rewriting</dt>
+<dt class="hdlist1"><code>--full-history</code> without parent rewriting</dt>
<dd>
<p>This mode differs from the default in one point: always follow
all parents of a merge, even if it is TREESAME to one of them.
@@ -1155,7 +1155,7 @@
them disconnected.</p>
</div>
</dd>
-<dt class="hdlist1">--full-history with parent rewriting</dt>
+<dt class="hdlist1"><code>--full-history</code> with parent rewriting</dt>
<dd>
<p>Ordinary commits are only included if they are !TREESAME
(though this can be changed, see <code>--sparse</code> below).</p>
@@ -1188,12 +1188,12 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--dense</dt>
+<dt class="hdlist1"><code>--dense</code></dt>
<dd>
<p>Commits that are walked are included if they are not TREESAME
to any parent.</p>
</dd>
-<dt class="hdlist1">--sparse</dt>
+<dt class="hdlist1"><code>--sparse</code></dt>
<dd>
<p>All commits that are walked are included.</p>
<div class="paragraph">
@@ -1202,7 +1202,7 @@
sides of the merge are never walked.</p>
</div>
</dd>
-<dt class="hdlist1">--simplify-merges</dt>
+<dt class="hdlist1"><code>--simplify-merges</code></dt>
<dd>
<p>First, build a history graph in the same way that
<code>--full-history</code> with parent rewriting does (see above).</p>
@@ -1277,10 +1277,10 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--ancestry-path[=<commit>]</dt>
+<dt class="hdlist1"><code>--ancestry-path</code>[<code>=</code><em><commit></em>]</dt>
<dd>
<p>Limit the displayed commits to those which are an ancestor of
-<commit>, or which are a descendant of <commit>, or are <commit>
+<em><commit></em>, or which are a descendant of <em><commit></em>, or are <em><commit></em>
itself.</p>
<div class="paragraph">
<p>As an example use case, consider the following commit history:</p>
@@ -1298,16 +1298,16 @@
<p>A regular <em>D..M</em> computes the set of commits that are ancestors of <code>M</code>,
but excludes the ones that are ancestors of <code>D</code>. This is useful to see
what happened to the history leading to <code>M</code> since <code>D</code>, in the sense
-that “what does <code>M</code> have that did not exist in <code>D</code>”. The result in this
+that "what does <code>M</code> have that did not exist in <code>D</code>". The result in this
example would be all the commits, except <code>A</code> and <code>B</code> (and <code>D</code> itself,
of course).</p>
</div>
<div class="paragraph">
<p>When we want to find out what commits in <code>M</code> are contaminated with the
bug introduced by <code>D</code> and need fixing, however, we might want to view
-only the subset of <em>D..M</em> that are actually descendants of <code>D</code>, i.e.
+only the subset of <code>D</code><code>..</code><code>M</code> that are actually descendants of <code>D</code>, i.e.
excluding <code>C</code> and <code>K</code>. This is exactly what the <code>--ancestry-path</code>
-option does. Applied to the <em>D..M</em> range, it results in:</p>
+option does. Applied to the <code>D</code><code>..</code><code>M</code> range, it results in:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -1320,7 +1320,7 @@
</div>
<div class="paragraph">
<p>We can also use <code>--ancestry-path=D</code> instead of <code>--ancestry-path</code> which
-means the same thing when applied to the <em>D..M</em> range but is just more
+means the same thing when applied to the <code>D</code><code>..</code><code>M</code> range but is just more
explicit.</p>
</div>
<div class="paragraph">
@@ -1458,7 +1458,7 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--show-pulls</dt>
+<dt class="hdlist1"><code>--show-pulls</code></dt>
<dd>
<p>In addition to the commits shown in the default history, show
each merge commit that is not TREESAME to its first parent but
@@ -1517,7 +1517,7 @@
<h3 id="_bisection_helpers">Bisection Helpers</h3>
<div class="dlist">
<dl>
-<dt class="hdlist1">--bisect</dt>
+<dt class="hdlist1"><code>--bisect</code></dt>
<dd>
<p>Limit output to the one commit object which is roughly halfway between
included and excluded commits. Note that the bad bisection ref
@@ -1546,7 +1546,7 @@
one.</p>
</div>
</dd>
-<dt class="hdlist1">--bisect-vars</dt>
+<dt class="hdlist1"><code>--bisect-vars</code></dt>
<dd>
<p>This calculates the same as <code>--bisect</code>, except that refs in
<code>refs/bisect/</code> are not used, and except that this outputs
@@ -1559,7 +1559,7 @@
<code>bisect_bad</code>, and the number of commits we are bisecting right now to
<code>bisect_all</code>.</p>
</dd>
-<dt class="hdlist1">--bisect-all</dt>
+<dt class="hdlist1"><code>--bisect-all</code></dt>
<dd>
<p>This outputs all the commit objects between the included and excluded
commits, ordered by their distance to the included and excluded
@@ -1587,17 +1587,17 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--date-order</dt>
+<dt class="hdlist1"><code>--date-order</code></dt>
<dd>
<p>Show no parents before all of its children are shown, but
otherwise show commits in the commit timestamp order.</p>
</dd>
-<dt class="hdlist1">--author-date-order</dt>
+<dt class="hdlist1"><code>--author-date-order</code></dt>
<dd>
<p>Show no parents before all of its children are shown, but
otherwise show commits in the author timestamp order.</p>
</dd>
-<dt class="hdlist1">--topo-order</dt>
+<dt class="hdlist1"><code>--topo-order</code></dt>
<dd>
<p>Show no parents before all of its children are shown, and
avoid showing commits on multiple lines of history
@@ -1624,9 +1624,9 @@
together.</p>
</div>
</dd>
-<dt class="hdlist1">--reverse</dt>
+<dt class="hdlist1"><code>--reverse</code></dt>
<dd>
-<p>Output the commits chosen to be shown (see Commit Limiting
+<p>Output the commits chosen to be shown (see <em>Commit Limiting</em>
section above) in reverse order. Cannot be combined with
<code>--walk-reflogs</code>.</p>
</dd>
@@ -1640,45 +1640,45 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--objects</dt>
+<dt class="hdlist1"><code>--objects</code></dt>
<dd>
<p>Print the object IDs of any object referenced by the listed
-commits. <code>--objects</code> <code>foo</code> <code>^bar</code> thus means “send me
+commits. <code>--objects</code> <code>foo</code> <code>^bar</code> thus means "send me
all object IDs which I need to download if I have the commit
-object <em>bar</em> but not <em>foo</em>”. See also <code>--object-names</code> below.</p>
+object <code>bar</code> but not <code>foo</code>". See also <code>--object-names</code> below.</p>
</dd>
-<dt class="hdlist1">--in-commit-order</dt>
+<dt class="hdlist1"><code>--in-commit-order</code></dt>
<dd>
<p>Print tree and blob ids in order of the commits. The tree
and blob ids are printed after they are first referenced
by a commit.</p>
</dd>
-<dt class="hdlist1">--objects-edge</dt>
+<dt class="hdlist1"><code>--objects-edge</code></dt>
<dd>
<p>Similar to <code>--objects</code>, but also print the IDs of excluded
-commits prefixed with a “-” character. This is used by
+commits prefixed with a "<code>-</code>" character. This is used by
<a href="git-pack-objects.html">git-pack-objects(1)</a> to build a “thin” pack, which records
objects in deltified form based on objects contained in these
excluded commits to reduce network traffic.</p>
</dd>
-<dt class="hdlist1">--objects-edge-aggressive</dt>
+<dt class="hdlist1"><code>--objects-edge-aggressive</code></dt>
<dd>
<p>Similar to <code>--objects-edge</code>, but it tries harder to find excluded
commits at the cost of increased time. This is used instead of
<code>--objects-edge</code> to build “thin” packs for shallow repositories.</p>
</dd>
-<dt class="hdlist1">--indexed-objects</dt>
+<dt class="hdlist1"><code>--indexed-objects</code></dt>
<dd>
<p>Pretend as if all trees and blobs used by the index are listed
on the command line. Note that you probably want to use
<code>--objects</code>, too.</p>
</dd>
-<dt class="hdlist1">--unpacked</dt>
+<dt class="hdlist1"><code>--unpacked</code></dt>
<dd>
<p>Only useful with <code>--objects</code>; print the object IDs that are not
in packs.</p>
</dd>
-<dt class="hdlist1">--object-names</dt>
+<dt class="hdlist1"><code>--object-names</code></dt>
<dd>
<p>Only useful with <code>--objects</code>; print the names of the object IDs
that are found. This is the default behavior. Note that the
@@ -1688,61 +1688,61 @@
to remove newlines; and if an object would appear multiple times
with different names, only one name is shown.</p>
</dd>
-<dt class="hdlist1">--no-object-names</dt>
+<dt class="hdlist1"><code>--no-object-names</code></dt>
<dd>
<p>Only useful with <code>--objects</code>; does not print the names of the object
IDs that are found. This inverts <code>--object-names</code>. This flag allows
the output to be more easily parsed by commands such as
<a href="git-cat-file.html">git-cat-file(1)</a>.</p>
</dd>
-<dt class="hdlist1">--filter=<filter-spec></dt>
+<dt class="hdlist1"><code>--filter=</code><em><filter-spec></em></dt>
<dd>
<p>Only useful with one of the <code>--objects*</code>; omits objects (usually
blobs) from the list of printed objects. The <em><filter-spec></em>
may be one of the following:</p>
<div class="paragraph">
-<p>The form <em>--filter=blob:none</em> omits all blobs.</p>
+<p>The form <code>--filter=blob:none</code> omits all blobs.</p>
</div>
<div class="paragraph">
-<p>The form <em>--filter=blob:limit=<n>[kmg]</em> omits blobs of size at least n
-bytes or units. n may be zero. The suffixes k, m, and g can be used
-to name units in KiB, MiB, or GiB. For example, <em>blob:limit=1k</em>
+<p>The form <code>--filter=blob:limit=</code><em><n></em>[<code>kmg</code>] omits blobs of size at least <em><n></em>
+bytes or units. <em><n></em> may be zero. The suffixes <code>k</code>, <code>m</code>, and <code>g</code> can be used
+to name units in KiB, MiB, or GiB. For example, <code>blob:limit=1k</code>
is the same as <em>blob:limit=1024</em>.</p>
</div>
<div class="paragraph">
-<p>The form <em>--filter=object:type=(tag|commit|tree|blob)</em> omits all objects
+<p>The form <code>--filter=object:type=</code>(<code>tag</code>|<code>commit</code>|<code>tree</code>|<code>blob</code>) omits all objects
which are not of the requested type.</p>
</div>
<div class="paragraph">
-<p>The form <em>--filter=sparse:oid=<blob-ish></em> uses a sparse-checkout
+<p>The form <code>--filter=sparse:oid=</code><em><blob-ish></em> uses a sparse-checkout
specification contained in the blob (or blob-expression) <em><blob-ish></em>
to omit blobs that would not be required for a sparse checkout on
the requested refs.</p>
</div>
<div class="paragraph">
-<p>The form <em>--filter=tree:<depth></em> omits all blobs and trees whose depth
-from the root tree is >= <depth> (minimum depth if an object is located
-at multiple depths in the commits traversed). <depth>=0 will not include
+<p>The form <code>--filter=tree:</code><em><depth></em> omits all blobs and trees whose depth
+from the root tree is >= <em><depth></em> (minimum depth if an object is located
+at multiple depths in the commits traversed). <em><depth></em>=0 will not include
any trees or blobs unless included explicitly in the command-line (or
-standard input when --stdin is used). <depth>=1 will include only the
+standard input when <code>--stdin</code> is used). <em><depth></em>=1 will include only the
tree and blobs which are referenced directly by a commit reachable from
-<commit> or an explicitly-given object. <depth>=2 is like <depth>=1
+<em><commit></em> or an explicitly-given object. <em><depth></em>=2 is like <depth>=1
while also including trees and blobs one more level removed from an
explicitly-given commit or tree.</p>
</div>
<div class="paragraph">
-<p>Note that the form <em>--filter=sparse:path=<path></em> that wants to read
+<p>Note that the form <code>--filter=sparse:path=</code><em><path></em> that wants to read
from an arbitrary path on the filesystem has been dropped for security
reasons.</p>
</div>
<div class="paragraph">
-<p>Multiple <em>--filter=</em> flags can be specified to combine filters. Only
+<p>Multiple <code>--filter=</code> flags can be specified to combine filters. Only
objects which are accepted by every filter are included.</p>
</div>
<div class="paragraph">
-<p>The form <em>--filter=combine:<filter1>+<filter2>+…​<filterN></em> can also be
+<p>The form <code>--filter=combine:</code><em><filter1></em><code>+</code><em><filter2></em><code>+</code><code>...</code><em><filterN></em> can also be
used to combined several filters, but this is harder than just repeating
-the <em>--filter</em> flag and is usually not necessary. Filters are joined by
+the <code>--filter</code> flag and is usually not necessary. Filters are joined by
<em>+</em> and individual filters are %-encoded (i.e. URL-encoded).
Besides the <em>+</em> and <em>%</em> characters, the following characters are
reserved and also must be encoded: <code>~</code>!@#$^&*()[]{}\;",<>?'`
@@ -1751,54 +1751,54 @@
</div>
<div class="paragraph">
<p>Other arbitrary characters can also be encoded. For instance,
-<em>combine:tree:3+blob:none</em> and <em>combine:tree%3A3+blob%3Anone</em> are
+<code>combine:tree:3+blob:none</code> and <code>combine:tree%3A3+blob%3Anone</code> are
equivalent.</p>
</div>
</dd>
-<dt class="hdlist1">--no-filter</dt>
+<dt class="hdlist1"><code>--no-filter</code></dt>
<dd>
<p>Turn off any previous <code>--filter=</code> argument.</p>
</dd>
-<dt class="hdlist1">--filter-provided-objects</dt>
+<dt class="hdlist1"><code>--filter-provided-objects</code></dt>
<dd>
<p>Filter the list of explicitly provided objects, which would otherwise
always be printed even if they did not match any of the filters. Only
useful with <code>--filter=</code>.</p>
</dd>
-<dt class="hdlist1">--filter-print-omitted</dt>
+<dt class="hdlist1"><code>--filter-print-omitted</code></dt>
<dd>
<p>Only useful with <code>--filter=</code>; prints a list of the objects omitted
by the filter. Object IDs are prefixed with a “~” character.</p>
</dd>
-<dt class="hdlist1">--missing=<missing-action></dt>
+<dt class="hdlist1"><code>--missing=</code><em><missing-action></em></dt>
<dd>
<p>A debug option to help with future "partial clone" development.
This option specifies how missing objects are handled.</p>
<div class="paragraph">
-<p>The form <em>--missing=error</em> requests that rev-list stop with an error if
+<p>The form <code>--missing=error</code> requests that rev-list stop with an error if
a missing object is encountered. This is the default action.</p>
</div>
<div class="paragraph">
-<p>The form <em>--missing=allow-any</em> will allow object traversal to continue
+<p>The form <code>--missing=allow-any</code> will allow object traversal to continue
if a missing object is encountered. Missing objects will silently be
omitted from the results.</p>
</div>
<div class="paragraph">
-<p>The form <em>--missing=allow-promisor</em> is like <em>allow-any</em>, but will only
+<p>The form <code>--missing=allow-promisor</code> is like <code>allow-any</code>, but will only
allow object traversal to continue for EXPECTED promisor missing objects.
Unexpected missing objects will raise an error.</p>
</div>
<div class="paragraph">
-<p>The form <em>--missing=print</em> is like <em>allow-any</em>, but will also print a
+<p>The form <code>--missing=print</code> is like <code>allow-any</code>, but will also print a
list of the missing objects. Object IDs are prefixed with a “?” character.</p>
</div>
<div class="paragraph">
-<p>The form <em>--missing=print-info</em> is like <em>print</em>, but will also print additional
+<p>The form <code>--missing=print-info</code> is like <code>print</code>, but will also print additional
information about the missing object inferred from its containing object. The
information is all printed on the same line with the missing object ID in the
form: ?<em><oid></em> [<em><token></em><code>=</code><em><value></em>].... The <em><token></em><code>=</code><em><value></em> pairs containing
-additional information are separated from each other by a SP. The value is
-encoded in a token specific fashion, but SP or LF contained in value are always
+additional information are separated from each other by a <em>SP</em>. The value is
+encoded in a token specific fashion, but <em>SP</em> or <em>LF</em> contained in value are always
expected to be represented in such a way that the resulting encoded value does
not have either of these two problematic bytes. Each <em><token></em><code>=</code><em><value></em> may be
one of the following:</p>
@@ -1809,7 +1809,7 @@
<ul>
<li>
<p>The <code>path=</code><em><path></em> shows the path of the missing object inferred from a
-containing object. A path containing SP or special characters is enclosed in
+containing object. A path containing <em>SP</em> or special characters is enclosed in
double-quotes in the C style as needed.</p>
</li>
<li>
@@ -1826,7 +1826,7 @@
we cannot get their Object ID though, an error will be raised.</p>
</div>
</dd>
-<dt class="hdlist1">--exclude-promisor-objects</dt>
+<dt class="hdlist1"><code>--exclude-promisor-objects</code></dt>
<dd>
<p>(For internal use only.) Prefilter object traversal at
promisor boundary. This is used with partial clone. This is
@@ -1834,7 +1834,7 @@
traversal, rather than just silencing errors about missing
objects.</p>
</dd>
-<dt class="hdlist1">--no-walk[=(sorted|unsorted)]</dt>
+<dt class="hdlist1"><code>--no-walk</code>[<code>=</code>(<code>sorted</code>|<code>unsorted</code>)]</dt>
<dd>
<p>Only show the given commits, but do not traverse their ancestors.
This has no effect if a range is specified. If the argument
@@ -1844,7 +1844,7 @@
by commit time.
Cannot be combined with <code>--graph</code>.</p>
</dd>
-<dt class="hdlist1">--do-walk</dt>
+<dt class="hdlist1"><code>--do-walk</code></dt>
<dd>
<p>Overrides a previous <code>--no-walk</code>.</p>
</dd>
@@ -1860,47 +1860,56 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--pretty[=<format>]</dt>
-<dt class="hdlist1">--format=<format></dt>
+<dt class="hdlist1"><code>--pretty</code>[<code>=</code><em><format></em>]</dt>
+<dt class="hdlist1"><code>--format=</code><em><format></em></dt>
<dd>
<p>Pretty-print the contents of the commit logs in a given format,
-where <em><format></em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,
-<em>full</em>, <em>fuller</em>, <em>reference</em>, <em>email</em>, <em>raw</em>, <em>format:<string></em>
-and <em>tformat:<string></em>. When <em><format></em> is none of the above,
-and has <em>%placeholder</em> in it, it acts as if
-<em>--pretty=tformat:<format></em> were given.</p>
+where <em><format></em> can be one of <code>oneline</code>, <code>short</code>, <code>medium</code>,
+<code>full</code>, <code>fuller</code>, <code>reference</code>, <code>email</code>, <code>raw</code>, <code>format:</code><em><string></em>
+and <code>tformat:</code><em><string></em>. When <em><format></em> is none of the above,
+and has <code>%</code><em><placeholder></em> in it, it acts as if
+<code>--pretty=tformat:</code><em><format></em> were given.</p>
<div class="paragraph">
<p>See the "PRETTY FORMATS" section for some additional details for each
-format. When <em>=<format></em> part is omitted, it defaults to <em>medium</em>.</p>
+format. When <code>=</code><em><format></em> part is omitted, it defaults to <code>medium</code>.</p>
</div>
-<div class="paragraph">
-<p>Note: you can specify the default pretty format in the repository
-configuration (see <a href="git-config.html">git-config(1)</a>).</p>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+you can specify the default pretty format in the repository
+configuration (see <a href="git-config.html">git-config(1)</a>).
+</td>
+</tr>
+</table>
</div>
</dd>
-<dt class="hdlist1">--abbrev-commit</dt>
+<dt class="hdlist1"><code>--abbrev-commit</code></dt>
<dd>
<p>Instead of showing the full 40-byte hexadecimal commit object
name, show a prefix that names the object uniquely.
-"--abbrev=<n>" (which also modifies diff output, if it is displayed)
+<code>--abbrev=</code><em><n></em> (which also modifies diff output, if it is displayed)
option can be used to specify the minimum length of the prefix.</p>
<div class="paragraph">
-<p>This should make "--pretty=oneline" a whole lot more readable for
+<p>This should make <code>--pretty=oneline</code> a whole lot more readable for
people using 80-column terminals.</p>
</div>
</dd>
-<dt class="hdlist1">--no-abbrev-commit</dt>
+<dt class="hdlist1"><code>--no-abbrev-commit</code></dt>
<dd>
<p>Show the full 40-byte hexadecimal commit object name. This negates
<code>--abbrev-commit</code>, either explicit or implied by other options such
-as "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.</p>
+as <code>--oneline</code>. It also overrides the <code>log.abbrevCommit</code> variable.</p>
</dd>
-<dt class="hdlist1">--oneline</dt>
+<dt class="hdlist1"><code>--oneline</code></dt>
<dd>
-<p>This is a shorthand for "--pretty=oneline --abbrev-commit"
+<p>This is a shorthand for <code>--pretty=oneline</code> <code>--abbrev-commit</code>
used together.</p>
</dd>
-<dt class="hdlist1">--encoding=<encoding></dt>
+<dt class="hdlist1"><code>--encoding=</code><em><encoding></em></dt>
<dd>
<p>Commit objects record the character encoding used for the log message
in their encoding header; this option can be used to tell the
@@ -1913,9 +1922,9 @@
to convert the commit, we will quietly output the original
object verbatim.</p>
</dd>
-<dt class="hdlist1">--expand-tabs=<n></dt>
-<dt class="hdlist1">--expand-tabs</dt>
-<dt class="hdlist1">--no-expand-tabs</dt>
+<dt class="hdlist1"><code>--expand-tabs=</code><em><n></em></dt>
+<dt class="hdlist1"><code>--expand-tabs</code></dt>
+<dt class="hdlist1"><code>--no-expand-tabs</code></dt>
<dd>
<p>Perform a tab expansion (replace each tab with enough spaces
to fill to the next display column that is a multiple of <em><n></em>)
@@ -1925,20 +1934,20 @@
which disables tab expansion.</p>
<div class="paragraph">
<p>By default, tabs are expanded in pretty formats that indent the log
-message by 4 spaces (i.e. <em>medium</em>, which is the default, <em>full</em>,
-and <em>fuller</em>).</p>
+message by 4 spaces (i.e. <code>medium</code>, which is the default, <code>full</code>,
+and <code>fuller</code>).</p>
</div>
</dd>
-<dt class="hdlist1">--show-signature</dt>
+<dt class="hdlist1"><code>--show-signature</code></dt>
<dd>
<p>Check the validity of a signed commit object by passing the signature
to <code>gpg</code> <code>--verify</code> and show the output.</p>
</dd>
-<dt class="hdlist1">--relative-date</dt>
+<dt class="hdlist1"><code>--relative-date</code></dt>
<dd>
<p>Synonym for <code>--date=relative</code>.</p>
</dd>
-<dt class="hdlist1">--date=<format></dt>
+<dt class="hdlist1"><code>--date=</code><em><format></em></dt>
<dd>
<p>Only takes effect for dates shown in human-readable format, such
as when using <code>--pretty</code>. <code>log.date</code> config variable sets a default
@@ -1989,7 +1998,7 @@
00:00:00 UTC), followed by a space, and then the timezone as an offset
from UTC (a <code>+</code> or <code>-</code> with four digits; the first two are hours, and
the second two are minutes). I.e., as if the timestamp were formatted
-with <code>strftime</code>("%s %z")).
+with <code>strftime</code>("%s <code>%z</code>")).
Note that the <code>-local</code> option does not affect the seconds-since-epoch
value (which is always measured in UTC), but does switch the accompanying
timezone value.</p>
@@ -2008,12 +2017,12 @@
has no effect.</p>
</div>
<div class="paragraph">
-<p><code>--date=format:..</code>. feeds the format <code>...</code> to your system <code>strftime</code>,
-except for %s, %z, and %Z, which are handled internally.
-Use <code>--date=format:</code>%c to show the date in your system locale’s
-preferred format. See the <code>strftime</code> manual for a complete list of
+<p><code>--date=format:</code><em><format></em> feeds the <em><format></em> to your system <code>strftime</code>,
+except for <code>%s</code>, <code>%z</code>, and <code>%Z</code>, which are handled internally.
+Use <code>--date=format:%c</code> to show the date in your system locale’s
+preferred format. See the <code>strftime</code>(3) manual for a complete list of
format placeholders. When using <code>-local</code>, the correct syntax is
-<code>--date=format-local:..</code>..</p>
+<code>--date=format-local:</code><em><format></em>.</p>
</div>
<div class="paragraph">
<p><code>--date=default</code> is the default format, and is based on ctime(3)
@@ -2025,36 +2034,36 @@
</div>
</div>
</dd>
-<dt class="hdlist1">--header</dt>
+<dt class="hdlist1"><code>--header</code></dt>
<dd>
<p>Print the contents of the commit in raw-format; each record is
separated with a NUL character.</p>
</dd>
-<dt class="hdlist1">--no-commit-header</dt>
+<dt class="hdlist1"><code>--no-commit-header</code></dt>
<dd>
<p>Suppress the header line containing "commit" and the object ID printed before
the specified format. This has no effect on the built-in formats; only custom
formats are affected.</p>
</dd>
-<dt class="hdlist1">--commit-header</dt>
+<dt class="hdlist1"><code>--commit-header</code></dt>
<dd>
<p>Overrides a previous <code>--no-commit-header</code>.</p>
</dd>
-<dt class="hdlist1">--parents</dt>
+<dt class="hdlist1"><code>--parents</code></dt>
<dd>
<p>Print also the parents of the commit (in the form "commit parent…​").
Also enables parent rewriting, see <em>History Simplification</em> above.</p>
</dd>
-<dt class="hdlist1">--children</dt>
+<dt class="hdlist1"><code>--children</code></dt>
<dd>
<p>Print also the children of the commit (in the form "commit child…​").
Also enables parent rewriting, see <em>History Simplification</em> above.</p>
</dd>
-<dt class="hdlist1">--timestamp</dt>
+<dt class="hdlist1"><code>--timestamp</code></dt>
<dd>
<p>Print the raw commit timestamp.</p>
</dd>
-<dt class="hdlist1">--left-right</dt>
+<dt class="hdlist1"><code>--left-right</code></dt>
<dd>
<p>Mark which side of a symmetric difference a commit is reachable from.
Commits from the left side are prefixed with < and those from
@@ -2088,7 +2097,7 @@
</div>
</div>
</dd>
-<dt class="hdlist1">--graph</dt>
+<dt class="hdlist1"><code>--graph</code></dt>
<dd>
<p>Draw a text-based graphical representation of the commit history
on the left hand side of the output. This may cause extra lines
@@ -2103,15 +2112,15 @@
<code>--date-order</code> option may also be specified.</p>
</div>
</dd>
-<dt class="hdlist1">--show-linear-break[=<barrier>]</dt>
+<dt class="hdlist1"><code>--show-linear-break</code>[<code>=</code><em><barrier></em>]</dt>
<dd>
-<p>When --graph is not used, all history branches are flattened
+<p>When <code>--graph</code> is not used, all history branches are flattened
which can make it hard to see that the two consecutive commits
do not belong to a linear branch. This option puts a barrier
in between them in that case. If <em><barrier></em> is specified, it
is the string that will be shown instead of the default one.</p>
</dd>
-<dt class="hdlist1">--count</dt>
+<dt class="hdlist1"><code>--count</code></dt>
<dd>
<p>Print a number stating how many commits would have been
listed, and suppress all other output. When used together
@@ -2131,11 +2140,11 @@
<div class="sectionbody">
<div class="paragraph">
<p>If the commit is a merge, and if the pretty-format
-is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
-inserted before the <em>Author:</em> line. This line begins with
+is not <code>oneline</code>, <code>email</code> or <code>raw</code>, an additional line is
+inserted before the <code>Author:</code> line. This line begins with
"Merge: " and the hashes of ancestral commits are printed,
separated by spaces. Note that the listed commits may not
-necessarily be the list of the <strong>direct</strong> parent commits if you
+necessarily be the list of the <em>direct</em> parent commits if you
have limited your view of history: for example, if you are
only interested in changes related to a certain directory or
file.</p>
@@ -2144,14 +2153,14 @@
<p>There are several built-in formats, and you can define
additional formats by setting a pretty.<name>
config option to either another format name, or a
-<em>format:</em> string, as described below (see
+<code>format:</code> string, as described below (see
<a href="git-config.html">git-config(1)</a>). Here are the details of the
built-in formats:</p>
</div>
<div class="ulist">
<ul>
<li>
-<p><em>oneline</em></p>
+<p><code>oneline</code></p>
<div class="literalblock">
<div class="content">
<pre><hash> <title-line></pre>
@@ -2162,7 +2171,7 @@
</div>
</li>
<li>
-<p><em>short</em></p>
+<p><code>short</code></p>
<div class="literalblock">
<div class="content">
<pre>commit <hash>
@@ -2176,7 +2185,7 @@
</div>
</li>
<li>
-<p><em>medium</em></p>
+<p><code>medium</code></p>
<div class="literalblock">
<div class="content">
<pre>commit <hash>
@@ -2196,7 +2205,7 @@
</div>
</li>
<li>
-<p><em>full</em></p>
+<p><code>full</code></p>
<div class="literalblock">
<div class="content">
<pre>commit <hash>
@@ -2216,7 +2225,7 @@
</div>
</li>
<li>
-<p><em>fuller</em></p>
+<p><code>fuller</code></p>
<div class="literalblock">
<div class="content">
<pre>commit <hash>
@@ -2238,7 +2247,7 @@
</div>
</li>
<li>
-<p><em>reference</em></p>
+<p><code>reference</code></p>
<div class="literalblock">
<div class="content">
<pre><abbrev-hash> (<title-line>, <short-author-date>)</pre>
@@ -2246,7 +2255,7 @@
</div>
<div class="paragraph">
<p>This format is used to refer to another commit in a commit message and
-is the same as <code>--pretty=</code>'format:%C(<code>auto</code>)%h (%s, %ad)'. By default,
+is the same as <code>--pretty=</code>'format:%C(<code>auto</code>)<code>%h</code> (<code>%s,</code> <code>%ad</code>)'. By default,
the date is formatted with <code>--date=short</code> unless another <code>--date</code> option
is explicitly specified. As with any <code>format:</code> with format
placeholders, its output is not affected by other options like
@@ -2254,7 +2263,7 @@
</div>
</li>
<li>
-<p><em>email</em></p>
+<p><code>email</code></p>
<div class="literalblock">
<div class="content">
<pre>From <hash> <date>
@@ -2270,20 +2279,20 @@
</div>
</li>
<li>
-<p><em>mboxrd</em></p>
+<p><code>mboxrd</code></p>
<div class="paragraph">
-<p>Like <em>email</em>, but lines in the commit message starting with "From "
+<p>Like <code>email</code>, but lines in the commit message starting with "From "
(preceded by zero or more ">") are quoted with ">" so they aren’t
confused as starting a new commit.</p>
</div>
</li>
<li>
-<p><em>raw</em></p>
+<p><code>raw</code></p>
<div class="paragraph">
-<p>The <em>raw</em> format shows the entire commit exactly as
+<p>The <code>raw</code> format shows the entire commit exactly as
stored in the commit object. Notably, the hashes are
-displayed in full, regardless of whether --abbrev or
---no-abbrev are used, and <em>parents</em> information show the
+displayed in full, regardless of whether <code>--abbrev</code> or
+<code>--no-abbrev</code> are used, and <em>parents</em> information show the
true parent commits, without taking grafts or history
simplification into account. Note that this format affects the way
commits are displayed, but not the way the diff is shown e.g. with
@@ -2292,12 +2301,12 @@
</div>
</li>
<li>
-<p><em>format:<format-string></em></p>
+<p><code>format:</code><em><format-string></em></p>
<div class="paragraph">
-<p>The <em>format:<format-string></em> format allows you to specify which information
+<p>The <code>format:</code><em><format-string></em> format allows you to specify which information
you want to show. It works a little bit like printf format,
-with the notable exception that you get a newline with <em>%n</em>
-instead of <em>\n</em>.</p>
+with the notable exception that you get a newline with <code>%n</code>
+instead of <code>\n</code>.</p>
</div>
<div class="paragraph">
<p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
@@ -2318,17 +2327,17 @@
<p>Placeholders that expand to a single literal character:</p>
<div class="dlist">
<dl>
-<dt class="hdlist1"><em>%n</em></dt>
+<dt class="hdlist1"><code>%n</code></dt>
<dd>
<p>newline</p>
</dd>
-<dt class="hdlist1"><em>%%</em></dt>
+<dt class="hdlist1"><code>%%</code></dt>
<dd>
-<p>a raw <em>%</em></p>
+<p>a raw <code>%</code></p>
</dd>
-<dt class="hdlist1"><em>%x00</em></dt>
+<dt class="hdlist1"><code>%x00</code></dt>
<dd>
-<p><em>%x</em> followed by two hexadecimal digits is replaced with a
+<p><code>%x</code> followed by two hexadecimal digits is replaced with a
byte with the hexadecimal digits' value (we will call this
"literal formatting code" in the rest of this document).</p>
</dd>
@@ -2339,60 +2348,60 @@
<p>Placeholders that affect formatting of later placeholders:</p>
<div class="dlist">
<dl>
-<dt class="hdlist1"><em>%Cred</em></dt>
+<dt class="hdlist1"><code>%Cred</code></dt>
<dd>
<p>switch color to red</p>
</dd>
-<dt class="hdlist1"><em>%Cgreen</em></dt>
+<dt class="hdlist1"><code>%Cgreen</code></dt>
<dd>
<p>switch color to green</p>
</dd>
-<dt class="hdlist1"><em>%Cblue</em></dt>
+<dt class="hdlist1"><code>%Cblue</code></dt>
<dd>
<p>switch color to blue</p>
</dd>
-<dt class="hdlist1"><em>%Creset</em></dt>
+<dt class="hdlist1"><code>%Creset</code></dt>
<dd>
<p>reset color</p>
</dd>
-<dt class="hdlist1"><em>%C(…​)</em></dt>
+<dt class="hdlist1"><code>%C</code>(<em><spec></em>)</dt>
<dd>
<p>color specification, as described under Values in the
"CONFIGURATION FILE" section of <a href="git-config.html">git-config(1)</a>. By
default, colors are shown only when enabled for log output
(by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and respecting
the <code>auto</code> settings of the former if we are going to a
-terminal). %C(<code>auto,</code><code>...</code>) is accepted as a historical
-synonym for the default (e.g., %C(<code>auto,red</code>)). Specifying
-%C(<code>always,</code><code>...</code>) will show the colors even when color is
+terminal). <code>%C</code>(<code>auto,</code><em><spec></em>) is accepted as a historical
+synonym for the default (e.g., <code>%C</code>(<code>auto,red</code>)). Specifying
+<code>%C</code>(<code>always,</code><em><spec></em>) will show the colors even when color is
not otherwise enabled (though consider just using
-<code>--color=always</code> to enable color for the whole output,
+<code>--color=always</code> to enable color for the whole output,
including this format and anything else git might color).
-<code>auto</code> alone (i.e. %C(<code>auto</code>)) will turn on auto coloring
+<code>auto</code> alone (i.e. <code>%C</code>(<code>auto</code>)) will turn on auto coloring
on the next placeholders until the color is switched
again.</p>
</dd>
-<dt class="hdlist1"><em>%m</em></dt>
+<dt class="hdlist1"><code>%m</code></dt>
<dd>
<p>left (<), right (>) or boundary (<code>-</code>) mark</p>
</dd>
-<dt class="hdlist1"><em>%w([<w>[,<i1>[,<i2>]]])</em></dt>
+<dt class="hdlist1"><code>%w</code>([<em><w></em>[<code>,</code><em><i1></em>[<code>,</code><em><i2></em>]]])</dt>
<dd>
-<p>switch line wrapping, like the -w option of
+<p>switch line wrapping, like the <code>-w</code> option of
<a href="git-shortlog.html">git-shortlog(1)</a>.</p>
</dd>
-<dt class="hdlist1"><em>%<( <N> [,trunc|ltrunc|mtrunc])</em></dt>
+<dt class="hdlist1"><code>%</code><(<em><n></em>[<code>,</code>(<code>trunc</code>|<code>ltrunc</code>|<code>mtrunc</code>)])</dt>
<dd>
<p>make the next placeholder take at
least N column widths, padding spaces on
the right if necessary. Optionally
-truncate (with ellipsis <em>..</em>) at the left (ltrunc) <code>..</code><code>ft</code>,
+truncate (with ellipsis <code>..</code>) at the left (ltrunc) <code>..</code><code>ft</code>,
the middle (mtrunc) <code>mi</code><code>..</code><code>le</code>, or the end
(trunc) <code>rig..</code>, if the output is longer than
-N columns.
+<em><n></em> columns.
Note 1: that truncating
-only works correctly with N >= 2.
-Note 2: spaces around the N and M (see below)
+only works correctly with <em><n></em> >= 2.
+Note 2: spaces around the <em><n></em> and <em><m></em> (see below)
values are optional.
Note 3: Emojis and other wide characters
will take two display columns, which may
@@ -2400,29 +2409,32 @@
Note 4: decomposed character combining marks
may be misplaced at padding boundaries.</p>
</dd>
-<dt class="hdlist1"><em>%<|( <M> )</em></dt>
+<dt class="hdlist1"><code>%</code><|(<em><m></em> )</dt>
<dd>
-<p>make the next placeholder take at least until Mth
+<p>make the next placeholder take at least until <em><m></em> th
display column, padding spaces on the right if necessary.
-Use negative M values for column positions measured
+Use negative <em><m></em> values for column positions measured
from the right hand edge of the terminal window.</p>
</dd>
-<dt class="hdlist1"><em>%>( <N> )</em>, <em>%>|( <M> )</em></dt>
+<dt class="hdlist1"><code>%</code>>(<em><n></em>)</dt>
+<dt class="hdlist1"><code>%</code>>|(<em><m></em>)</dt>
<dd>
-<p>similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em> respectively,
+<p>similar to <code>%</code><(<em><n></em>), <code>%</code><|(<em><m></em>) respectively,
but padding spaces on the left</p>
</dd>
-<dt class="hdlist1"><em>%>>( <N> )</em>, <em>%>>|( <M> )</em></dt>
+<dt class="hdlist1"><code>%</code>>>(<em><n></em>)</dt>
+<dt class="hdlist1"><code>%</code>>>|(<em><m></em>)</dt>
<dd>
-<p>similar to <em>%>( <N> )</em>, <em>%>|( <M> )</em>
+<p>similar to <code>%</code>>(<em><n></em>), <code>%</code>>|(<em><m></em>)
respectively, except that if the next
placeholder takes more spaces than given and
there are spaces on its left, use those
spaces</p>
</dd>
-<dt class="hdlist1"><em>%><( <N> )</em>, <em>%><|( <M> )</em></dt>
+<dt class="hdlist1"><code>%</code>><(<em><n></em>)</dt>
+<dt class="hdlist1"><code>%</code>><|(<em><m></em>)</dt>
<dd>
-<p>similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em>
+<p>similar to <code>%</code><(<em><n></em>), <code>%</code><|(<em><m></em>)
respectively, but padding both sides
(i.e. the text is centered)</p>
</dd>
@@ -2433,181 +2445,181 @@
<p>Placeholders that expand to information extracted from the commit:</p>
<div class="dlist">
<dl>
-<dt class="hdlist1"><em>%H</em></dt>
+<dt class="hdlist1"><code>%H</code></dt>
<dd>
<p>commit hash</p>
</dd>
-<dt class="hdlist1"><em>%h</em></dt>
+<dt class="hdlist1"><code>%h</code></dt>
<dd>
<p>abbreviated commit hash</p>
</dd>
-<dt class="hdlist1"><em>%T</em></dt>
+<dt class="hdlist1"><code>%T</code></dt>
<dd>
<p>tree hash</p>
</dd>
-<dt class="hdlist1"><em>%t</em></dt>
+<dt class="hdlist1"><code>%t</code></dt>
<dd>
<p>abbreviated tree hash</p>
</dd>
-<dt class="hdlist1"><em>%P</em></dt>
+<dt class="hdlist1"><code>%P</code></dt>
<dd>
<p>parent hashes</p>
</dd>
-<dt class="hdlist1"><em>%p</em></dt>
+<dt class="hdlist1"><code>%p</code></dt>
<dd>
<p>abbreviated parent hashes</p>
</dd>
-<dt class="hdlist1"><em>%an</em></dt>
+<dt class="hdlist1"><code>%an</code></dt>
<dd>
<p>author name</p>
</dd>
-<dt class="hdlist1"><em>%aN</em></dt>
+<dt class="hdlist1"><code>%aN</code></dt>
<dd>
<p>author name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a>
or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%ae</em></dt>
+<dt class="hdlist1"><code>%ae</code></dt>
<dd>
<p>author email</p>
</dd>
-<dt class="hdlist1"><em>%aE</em></dt>
+<dt class="hdlist1"><code>%aE</code></dt>
<dd>
<p>author email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a>
or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%al</em></dt>
+<dt class="hdlist1"><code>%al</code></dt>
<dd>
-<p>author email local-part (the part before the <em>@</em> sign)</p>
+<p>author email local-part (the part before the <code>@</code> sign)</p>
</dd>
-<dt class="hdlist1"><em>%aL</em></dt>
+<dt class="hdlist1"><code>%aL</code></dt>
<dd>
-<p>author local-part (see <em>%al</em>) respecting .mailmap, see
+<p>author local-part (see <code>%al</code>) respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%ad</em></dt>
+<dt class="hdlist1"><code>%ad</code></dt>
<dd>
<p>author date (format respects --date= option)</p>
</dd>
-<dt class="hdlist1"><em>%aD</em></dt>
+<dt class="hdlist1"><code>%aD</code></dt>
<dd>
<p>author date, RFC2822 style</p>
</dd>
-<dt class="hdlist1"><em>%ar</em></dt>
+<dt class="hdlist1"><code>%ar</code></dt>
<dd>
<p>author date, relative</p>
</dd>
-<dt class="hdlist1"><em>%at</em></dt>
+<dt class="hdlist1"><code>%at</code></dt>
<dd>
<p>author date, UNIX timestamp</p>
</dd>
-<dt class="hdlist1"><em>%ai</em></dt>
+<dt class="hdlist1"><code>%ai</code></dt>
<dd>
<p>author date, ISO 8601-like format</p>
</dd>
-<dt class="hdlist1"><em>%aI</em></dt>
+<dt class="hdlist1"><code>%aI</code></dt>
<dd>
<p>author date, strict ISO 8601 format</p>
</dd>
-<dt class="hdlist1"><em>%as</em></dt>
+<dt class="hdlist1"><code>%as</code></dt>
<dd>
<p>author date, short format (<code>YYYY-MM-DD</code>)</p>
</dd>
-<dt class="hdlist1"><em>%ah</em></dt>
+<dt class="hdlist1"><code>%ah</code></dt>
<dd>
<p>author date, human style (like the <code>--date=human</code> option of
<a href="git-rev-list.html">git-rev-list(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%cn</em></dt>
+<dt class="hdlist1"><code>%cn</code></dt>
<dd>
<p>committer name</p>
</dd>
-<dt class="hdlist1"><em>%cN</em></dt>
+<dt class="hdlist1"><code>%cN</code></dt>
<dd>
<p>committer name (respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%ce</em></dt>
+<dt class="hdlist1"><code>%ce</code></dt>
<dd>
<p>committer email</p>
</dd>
-<dt class="hdlist1"><em>%cE</em></dt>
+<dt class="hdlist1"><code>%cE</code></dt>
<dd>
<p>committer email (respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%cl</em></dt>
+<dt class="hdlist1"><code>%cl</code></dt>
<dd>
-<p>committer email local-part (the part before the <em>@</em> sign)</p>
+<p>committer email local-part (the part before the <code>@</code> sign)</p>
</dd>
-<dt class="hdlist1"><em>%cL</em></dt>
+<dt class="hdlist1"><code>%cL</code></dt>
<dd>
-<p>committer local-part (see <em>%cl</em>) respecting .mailmap, see
+<p>committer local-part (see <code>%cl</code>) respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%cd</em></dt>
+<dt class="hdlist1"><code>%cd</code></dt>
<dd>
<p>committer date (format respects --date= option)</p>
</dd>
-<dt class="hdlist1"><em>%cD</em></dt>
+<dt class="hdlist1"><code>%cD</code></dt>
<dd>
<p>committer date, RFC2822 style</p>
</dd>
-<dt class="hdlist1"><em>%cr</em></dt>
+<dt class="hdlist1"><code>%cr</code></dt>
<dd>
<p>committer date, relative</p>
</dd>
-<dt class="hdlist1"><em>%ct</em></dt>
+<dt class="hdlist1"><code>%ct</code></dt>
<dd>
<p>committer date, UNIX timestamp</p>
</dd>
-<dt class="hdlist1"><em>%ci</em></dt>
+<dt class="hdlist1"><code>%ci</code></dt>
<dd>
<p>committer date, ISO 8601-like format</p>
</dd>
-<dt class="hdlist1"><em>%cI</em></dt>
+<dt class="hdlist1"><code>%cI</code></dt>
<dd>
<p>committer date, strict ISO 8601 format</p>
</dd>
-<dt class="hdlist1"><em>%cs</em></dt>
+<dt class="hdlist1"><code>%cs</code></dt>
<dd>
<p>committer date, short format (<code>YYYY-MM-DD</code>)</p>
</dd>
-<dt class="hdlist1"><em>%ch</em></dt>
+<dt class="hdlist1"><code>%ch</code></dt>
<dd>
<p>committer date, human style (like the <code>--date=human</code> option of
<a href="git-rev-list.html">git-rev-list(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%d</em></dt>
+<dt class="hdlist1"><code>%d</code></dt>
<dd>
<p>ref names, like the --decorate option of <a href="git-log.html">git-log(1)</a></p>
</dd>
-<dt class="hdlist1"><em>%D</em></dt>
+<dt class="hdlist1"><code>%D</code></dt>
<dd>
<p>ref names without the " (", ")" wrapping.</p>
</dd>
-<dt class="hdlist1"><em>%(decorate[:<options>])</em></dt>
+<dt class="hdlist1"><code>%</code>(<code>decorate</code>[<code>:</code><em><option></em><code>,..</code>.])</dt>
<dd>
<p>ref names with custom decorations. The <code>decorate</code> string may be followed by a
colon and zero or more comma-separated options. Option values may contain
-literal formatting codes. These must be used for commas (%x2C) and closing
-parentheses (%x29), due to their role in the option syntax.</p>
+literal formatting codes. These must be used for commas (<code>%x2C</code>) and closing
+parentheses (<code>%x29</code>), due to their role in the option syntax.</p>
<div class="ulist">
<ul>
<li>
-<p><em>prefix=<value></em>: Shown before the list of ref names. Defaults to " (".</p>
+<p><code>prefix=</code><em><value></em>: Shown before the list of ref names. Defaults to " +(+".</p>
</li>
<li>
-<p><em>suffix=<value></em>: Shown after the list of ref names. Defaults to ")".</p>
+<p><code>suffix=</code><em><value></em>: Shown after the list of ref names. Defaults to ")".</p>
</li>
<li>
-<p><em>separator=<value></em>: Shown between ref names. Defaults to "<code>,</code> ".</p>
+<p><code>separator=</code><em><value></em>: Shown between ref names. Defaults to "<code>,</code> ".</p>
</li>
<li>
-<p><em>pointer=<value></em>: Shown between HEAD and the branch it points to, if any.
-Defaults to " <code>-</code>> ".</p>
+<p><code>pointer=</code><em><value></em>: Shown between HEAD and the branch it points to, if any.
+Defaults to " +→+ ".</p>
</li>
<li>
-<p><em>tag=<value></em>: Shown before tag names. Defaults to "<code>tag:</code> ".</p>
+<p><code>tag=</code><em><value></em>: Shown before tag names. Defaults to "<code>tag:</code> ".</p>
</li>
</ul>
</div>
@@ -2623,11 +2635,11 @@
</div>
<div class="paragraph">
<p>+
-%(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p>
+<code>%</code>(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p>
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1"><em>%(describe[:<options>])</em></dt>
+<dt class="hdlist1"><code>%</code>(<code>describe</code>[<code>:</code><em><option></em><code>,..</code>.])</dt>
<dd>
<p>human-readable name, like <a href="git-describe.html">git-describe(1)</a>; empty string for
undescribable commits. The <code>describe</code> string may be followed by a colon and
@@ -2636,56 +2648,56 @@
<div class="ulist">
<ul>
<li>
-<p><em>tags[=<bool-value>]</em>: Instead of only considering annotated tags,
+<p><code>tags</code>[<code>=</code><em><bool-value></em>]: Instead of only considering annotated tags,
consider lightweight tags as well.</p>
</li>
<li>
-<p><em>abbrev=<number></em>: Instead of using the default number of hexadecimal digits
+<p><code>abbrev=</code><em><number></em>: Instead of using the default number of hexadecimal digits
(which will vary according to the number of objects in the repository with a
default of 7) of the abbreviated object name, use <number> digits, or as many
digits as needed to form a unique object name.</p>
</li>
<li>
-<p><em>match=<pattern></em>: Only consider tags matching the given
-<code>glob</code>(<code>7</code>) pattern, excluding the "refs/tags/" prefix.</p>
+<p><code>match=</code><em><pattern></em>: Only consider tags matching the given
+<code>glob</code>(<code>7</code>) <em><pattern></em>, excluding the <code>refs/tags/</code> prefix.</p>
</li>
<li>
-<p><em>exclude=<pattern></em>: Do not consider tags matching the given
-<code>glob</code>(<code>7</code>) pattern, excluding the "refs/tags/" prefix.</p>
+<p><code>exclude=</code><em><pattern></em>: Do not consider tags matching the given
+<code>glob</code>(<code>7</code>) <em><pattern></em>, excluding the <code>refs/tags/</code> prefix.</p>
</li>
</ul>
</div>
</dd>
-<dt class="hdlist1"><em>%S</em></dt>
+<dt class="hdlist1"><code>%S</code></dt>
<dd>
<p>ref name given on the command line by which the commit was reached
(like <code>git</code> <code>log</code> <code>--source</code>), only works with <code>git</code> <code>log</code></p>
</dd>
-<dt class="hdlist1"><em>%e</em></dt>
+<dt class="hdlist1"><code>%e</code></dt>
<dd>
<p>encoding</p>
</dd>
-<dt class="hdlist1"><em>%s</em></dt>
+<dt class="hdlist1"><code>%s</code></dt>
<dd>
<p>subject</p>
</dd>
-<dt class="hdlist1"><em>%f</em></dt>
+<dt class="hdlist1"><code>%f</code></dt>
<dd>
<p>sanitized subject line, suitable for a filename</p>
</dd>
-<dt class="hdlist1"><em>%b</em></dt>
+<dt class="hdlist1"><code>%b</code></dt>
<dd>
<p>body</p>
</dd>
-<dt class="hdlist1"><em>%B</em></dt>
+<dt class="hdlist1"><code>%B</code></dt>
<dd>
<p>raw body (unwrapped subject and body)</p>
</dd>
-<dt class="hdlist1"><em>%GG</em></dt>
+<dt class="hdlist1"><code>%GG</code></dt>
<dd>
<p>raw verification message from GPG for a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%G?</em></dt>
+<dt class="hdlist1"><code>%G</code>?</dt>
<dd>
<p>show "G" for a good (valid) signature,
"B" for a bad signature,
@@ -2696,28 +2708,28 @@
"E" if the signature cannot be checked (e.g. missing key)
and "N" for no signature</p>
</dd>
-<dt class="hdlist1"><em>%GS</em></dt>
+<dt class="hdlist1"><code>%GS</code></dt>
<dd>
<p>show the name of the signer for a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%GK</em></dt>
+<dt class="hdlist1"><code>%GK</code></dt>
<dd>
<p>show the key used to sign a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%GF</em></dt>
+<dt class="hdlist1"><code>%GF</code></dt>
<dd>
<p>show the fingerprint of the key used to sign a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%GP</em></dt>
+<dt class="hdlist1"><code>%GP</code></dt>
<dd>
<p>show the fingerprint of the primary key whose subkey was used
to sign a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%GT</em></dt>
+<dt class="hdlist1"><code>%GT</code></dt>
<dd>
<p>show the trust level for the key used to sign a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%gD</em></dt>
+<dt class="hdlist1"><code>%gD</code></dt>
<dd>
<p>reflog selector, e.g., <code>refs/stash@</code>{1} or <code>refs/stash@</code>{2
<code>minutes</code> <code>ago</code>}; the format follows the rules described for the
@@ -2725,35 +2737,35 @@
given on the command line (so <code>git</code> <code>log</code> <code>-g</code> <code>refs/heads/master</code>
would yield <code>refs/heads/master@</code>{0}).</p>
</dd>
-<dt class="hdlist1"><em>%gd</em></dt>
+<dt class="hdlist1"><code>%gd</code></dt>
<dd>
-<p>shortened reflog selector; same as %gD, but the refname
+<p>shortened reflog selector; same as <code>%gD</code>, but the refname
portion is shortened for human readability (so
<code>refs/heads/master</code> becomes just <code>master</code>).</p>
</dd>
-<dt class="hdlist1"><em>%gn</em></dt>
+<dt class="hdlist1"><code>%gn</code></dt>
<dd>
<p>reflog identity name</p>
</dd>
-<dt class="hdlist1"><em>%gN</em></dt>
+<dt class="hdlist1"><code>%gN</code></dt>
<dd>
<p>reflog identity name (respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%ge</em></dt>
+<dt class="hdlist1"><code>%ge</code></dt>
<dd>
<p>reflog identity email</p>
</dd>
-<dt class="hdlist1"><em>%gE</em></dt>
+<dt class="hdlist1"><code>%gE</code></dt>
<dd>
<p>reflog identity email (respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%gs</em></dt>
+<dt class="hdlist1"><code>%gs</code></dt>
<dd>
<p>reflog subject</p>
</dd>
-<dt class="hdlist1"><em>%(trailers[:<options>])</em></dt>
+<dt class="hdlist1"><code>%</code>(<code>trailers</code>[<code>:</code><em><option></em><code>,..</code>.])</dt>
<dd>
<p>display the trailers of the body as interpreted by
<a href="git-interpret-trailers.html">git-interpret-trailers(1)</a>. The <code>trailers</code> string may be followed by
@@ -2762,43 +2774,43 @@
<div class="ulist">
<ul>
<li>
-<p><em>key=<key></em>: only show trailers with specified <key>. Matching is done
+<p><code>key=</code><em><key></em>: only show trailers with specified <key>. Matching is done
case-insensitively and trailing colon is optional. If option is
given multiple times trailer lines matching any of the keys are
shown. This option automatically enables the <code>only</code> option so that
non-trailer lines in the trailer block are hidden. If that is not
desired it can be disabled with <code>only=false</code>. E.g.,
-%(<code>trailers:key=Reviewed-by</code>) shows trailer lines with key
+<code>%</code>(<code>trailers:key=Reviewed-by</code>) shows trailer lines with key
<code>Reviewed-by</code>.</p>
</li>
<li>
-<p><em>only[=<bool>]</em>: select whether non-trailer lines from the trailer
+<p><code>only</code>[<code>=</code><em><bool></em>]: select whether non-trailer lines from the trailer
block should be included.</p>
</li>
<li>
-<p><em>separator=<sep></em>: specify the separator inserted between trailer
+<p><code>separator=</code><em><sep></em>: specify the separator inserted between trailer
lines. Defaults to a line feed character. The string <sep> may contain
the literal formatting codes described above. To use comma as
-separator one must use %x2C as it would otherwise be parsed as
-next option. E.g., %(<code>trailers:key=Ticket,separator=</code>%x2C )
+separator one must use <code>%x2C</code> as it would otherwise be parsed as
+next option. E.g., <code>%</code>(<code>trailers:key=Ticket,separator=%x2C</code> )
shows all trailer lines whose key is "Ticket" separated by a comma
and a space.</p>
</li>
<li>
-<p><em>unfold[=<bool>]</em>: make it behave as if interpret-trailer’s <code>--unfold</code>
+<p><code>unfold</code>[<code>=</code><em><bool></em>]: make it behave as if interpret-trailer’s <code>--unfold</code>
option was given. E.g.,
-%(<code>trailers:only,unfold=true</code>) unfolds and shows all trailer lines.</p>
+<code>%</code>(<code>trailers:only,unfold=true</code>) unfolds and shows all trailer lines.</p>
</li>
<li>
-<p><em>keyonly[=<bool>]</em>: only show the key part of the trailer.</p>
+<p><code>keyonly</code>[<code>=</code><em><bool></em>]: only show the key part of the trailer.</p>
</li>
<li>
-<p><em>valueonly[=<bool>]</em>: only show the value part of the trailer.</p>
+<p><code>valueonly</code>[<code>=</code><em><bool></em>]: only show the value part of the trailer.</p>
</li>
<li>
-<p><em>key_value_separator=<sep></em>: specify the separator inserted between
+<p><code>key_value_separator=</code><em><sep></em>: specify the separator inserted between
the key and value of each trailer. Defaults to ": ". Otherwise it
-shares the same semantics as <em>separator=<sep></em> above.</p>
+shares the same semantics as <code>separator=</code><em><sep></em> above.</p>
</li>
</ul>
</div>
@@ -2816,9 +2828,9 @@
</td>
<td class="content">
Some placeholders may depend on other options given to the
-revision traversal engine. For example, the %g* reflog options will
+revision traversal engine. For example, the <code>%g*</code> reflog options will
insert an empty string unless we are traversing reflog entries (e.g., by
-<code>git</code> <code>log</code> <code>-g</code>). The %d and %D placeholders will use the "short"
+<code>git</code> <code>log</code> <code>-g</code>). The <code>%d</code> and <code>%D</code> placeholders will use the "short"
decoration format if <code>--decorate</code> was not already provided on the command
line.
</td>
@@ -2827,31 +2839,31 @@
</div>
<div class="paragraph">
<p>The boolean options accept an optional value [<code>=</code><em><bool-value></em>]. The
-values taken by <code>--type=bool</code> git-config[1], like <code>yes</code> and <code>off</code>,
+values taken by <code>--type=bool</code> <a href="git-config.html">git-config(1)</a>, like <code>yes</code> and <code>off</code>,
are all accepted. Giving a boolean option without <code>=</code><em><value></em> is
equivalent to giving it with <code>=true</code>.</p>
</div>
<div class="paragraph">
-<p>If you add a <code>+</code> (plus sign) after <em>%</em> of a placeholder, a line-feed
+<p>If you add a <code>+</code> (plus sign) after <code>%</code> of a placeholder, a line-feed
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.</p>
</div>
<div class="paragraph">
-<p>If you add a <code>-</code> (minus sign) after <em>%</em> of a placeholder, all consecutive
+<p>If you add a <code>-</code> (minus sign) after <code>%</code> of a placeholder, all consecutive
line-feeds immediately preceding the expansion are deleted if and only if the
placeholder expands to an empty string.</p>
</div>
<div class="paragraph">
-<p>If you add a ` ` (space) after <em>%</em> of a placeholder, a space
+<p>If you add a ' ' (space) after <code>%</code> of a placeholder, a space
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.</p>
</div>
<div class="ulist">
<ul>
<li>
-<p><em>tformat:</em></p>
+<p><code>tformat:</code></p>
<div class="paragraph">
-<p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
+<p>The <code>tformat:</code> format works exactly like <code>format:</code>, except that it
provides "terminator" semantics instead of "separator" semantics. In
other words, each commit has the message terminator character (usually a
newline) appended, rather than a separator placed between entries.
@@ -2873,7 +2885,7 @@
</div>
</div>
<div class="paragraph">
-<p>In addition, any unrecognized string that has a % in it is interpreted
+<p>In addition, any unrecognized string that has a <code>%</code> in it is interpreted
as if it has <code>tformat:</code> in front of it. For example, these two are
equivalent:</p>
</div>
diff --git a/git-shortlog.html b/git-shortlog.html
index a4cd60e..14587b8 100644
--- a/git-shortlog.html
+++ b/git-shortlog.html
@@ -619,96 +619,96 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">-<number></dt>
-<dt class="hdlist1">-n <number></dt>
-<dt class="hdlist1">--max-count=<number></dt>
+<dt class="hdlist1"><code>-</code><em><number></em></dt>
+<dt class="hdlist1"><code>-n</code> <em><number></em></dt>
+<dt class="hdlist1"><code>--max-count=</code><em><number></em></dt>
<dd>
-<p>Limit the number of commits to output.</p>
+<p>Limit the output to <em><number></em> commits.</p>
</dd>
-<dt class="hdlist1">--skip=<number></dt>
+<dt class="hdlist1"><code>--skip=</code><em><number></em></dt>
<dd>
-<p>Skip <em>number</em> commits before starting to show the commit output.</p>
+<p>Skip <em><number></em> commits before starting to show the commit output.</p>
</dd>
-<dt class="hdlist1">--since=<date></dt>
-<dt class="hdlist1">--after=<date></dt>
+<dt class="hdlist1"><code>--since=</code><em><date></em></dt>
+<dt class="hdlist1"><code>--after=</code><em><date></em></dt>
<dd>
-<p>Show commits more recent than a specific date.</p>
+<p>Show commits more recent than <em><date></em>.</p>
</dd>
-<dt class="hdlist1">--since-as-filter=<date></dt>
+<dt class="hdlist1"><code>--since-as-filter=</code><em><date></em></dt>
<dd>
-<p>Show all commits more recent than a specific date. This visits
+<p>Show all commits more recent than <em><date></em>. This visits
all commits in the range, rather than stopping at the first commit which
-is older than a specific date.</p>
+is older than <em><date></em>.</p>
</dd>
-<dt class="hdlist1">--until=<date></dt>
-<dt class="hdlist1">--before=<date></dt>
+<dt class="hdlist1"><code>--until=</code><em><date></em></dt>
+<dt class="hdlist1"><code>--before=</code><em><date></em></dt>
<dd>
-<p>Show commits older than a specific date.</p>
+<p>Show commits older than <em><date></em>.</p>
</dd>
-<dt class="hdlist1">--author=<pattern></dt>
-<dt class="hdlist1">--committer=<pattern></dt>
+<dt class="hdlist1"><code>--author=</code><em><pattern></em></dt>
+<dt class="hdlist1"><code>--committer=</code><em><pattern></em></dt>
<dd>
<p>Limit the commits output to ones with author/committer
-header lines that match the specified pattern (regular
-expression). With more than one <code>--author=</code><em><pattern></em>,
-commits whose author matches any of the given patterns are
+header lines that match the <em><pattern></em> regular
+expression. With more than one <code>--author=</code><em><pattern></em>,
+commits whose author matches any of the <em><pattern></em> are
chosen (similarly for multiple <code>--committer=</code><em><pattern></em>).</p>
</dd>
-<dt class="hdlist1">--grep-reflog=<pattern></dt>
+<dt class="hdlist1"><code>--grep-reflog=</code><em><pattern></em></dt>
<dd>
<p>Limit the commits output to ones with reflog entries that
-match the specified pattern (regular expression). With
+match the <em><pattern></em> regular expression. With
more than one <code>--grep-reflog</code>, commits whose reflog message
matches any of the given patterns are chosen. It is an
error to use this option unless <code>--walk-reflogs</code> is in use.</p>
</dd>
-<dt class="hdlist1">--grep=<pattern></dt>
+<dt class="hdlist1"><code>--grep=</code><em><pattern></em></dt>
<dd>
<p>Limit the commits output to ones with a log message that
-matches the specified pattern (regular expression). With
+matches the <em><pattern></em> regular expression. With
more than one <code>--grep=</code><em><pattern></em>, commits whose message
-matches any of the given patterns are chosen (but see
+matches any of the <em><pattern></em> are chosen (but see
<code>--all-match</code>).</p>
<div class="paragraph">
<p>When <code>--notes</code> is in effect, the message from the notes is
matched as if it were part of the log message.</p>
</div>
</dd>
-<dt class="hdlist1">--all-match</dt>
+<dt class="hdlist1"><code>--all-match</code></dt>
<dd>
<p>Limit the commits output to ones that match all given <code>--grep</code>,
instead of ones that match at least one.</p>
</dd>
-<dt class="hdlist1">--invert-grep</dt>
+<dt class="hdlist1"><code>--invert-grep</code></dt>
<dd>
<p>Limit the commits output to ones with a log message that do not
-match the pattern specified with <code>--grep=</code><em><pattern></em>.</p>
+match the <em><pattern></em> specified with <code>--grep=</code><em><pattern></em>.</p>
</dd>
-<dt class="hdlist1">-i</dt>
-<dt class="hdlist1">--regexp-ignore-case</dt>
+<dt class="hdlist1"><code>-i</code></dt>
+<dt class="hdlist1"><code>--regexp-ignore-case</code></dt>
<dd>
<p>Match the regular expression limiting patterns without regard to letter
case.</p>
</dd>
-<dt class="hdlist1">--basic-regexp</dt>
+<dt class="hdlist1"><code>--basic-regexp</code></dt>
<dd>
<p>Consider the limiting patterns to be basic regular expressions;
this is the default.</p>
</dd>
-<dt class="hdlist1">-E</dt>
-<dt class="hdlist1">--extended-regexp</dt>
+<dt class="hdlist1"><code>-E</code></dt>
+<dt class="hdlist1"><code>--extended-regexp</code></dt>
<dd>
<p>Consider the limiting patterns to be extended regular expressions
instead of the default basic regular expressions.</p>
</dd>
-<dt class="hdlist1">-F</dt>
-<dt class="hdlist1">--fixed-strings</dt>
+<dt class="hdlist1"><code>-F</code></dt>
+<dt class="hdlist1"><code>--fixed-strings</code></dt>
<dd>
<p>Consider the limiting patterns to be fixed strings (don’t interpret
pattern as a regular expression).</p>
</dd>
-<dt class="hdlist1">-P</dt>
-<dt class="hdlist1">--perl-regexp</dt>
+<dt class="hdlist1"><code>-P</code></dt>
+<dt class="hdlist1"><code>--perl-regexp</code></dt>
<dd>
<p>Consider the limiting patterns to be Perl-compatible regular
expressions.</p>
@@ -718,23 +718,23 @@
providing this option will cause it to die.</p>
</div>
</dd>
-<dt class="hdlist1">--remove-empty</dt>
+<dt class="hdlist1"><code>--remove-empty</code></dt>
<dd>
<p>Stop when a given path disappears from the tree.</p>
</dd>
-<dt class="hdlist1">--merges</dt>
+<dt class="hdlist1"><code>--merges</code></dt>
<dd>
<p>Print only merge commits. This is exactly the same as <code>--min-parents=2</code>.</p>
</dd>
-<dt class="hdlist1">--no-merges</dt>
+<dt class="hdlist1"><code>--no-merges</code></dt>
<dd>
<p>Do not print commits with more than one parent. This is
exactly the same as <code>--max-parents=1</code>.</p>
</dd>
-<dt class="hdlist1">--min-parents=<number></dt>
-<dt class="hdlist1">--max-parents=<number></dt>
-<dt class="hdlist1">--no-min-parents</dt>
-<dt class="hdlist1">--no-max-parents</dt>
+<dt class="hdlist1"><code>--min-parents=</code><em><number></em></dt>
+<dt class="hdlist1"><code>--max-parents=</code><em><number></em></dt>
+<dt class="hdlist1"><code>--no-min-parents</code></dt>
+<dt class="hdlist1"><code>--no-max-parents</code></dt>
<dd>
<p>Show only commits which have at least (or at most) that many parent
commits. In particular, <code>--max-parents=1</code> is the same as <code>--no-merges</code>,
@@ -746,7 +746,7 @@
parents) and <code>--max-parents=-1</code> (negative numbers denote no upper limit).</p>
</div>
</dd>
-<dt class="hdlist1">--first-parent</dt>
+<dt class="hdlist1"><code>--first-parent</code></dt>
<dd>
<p>When finding commits to include, follow only the first
parent commit upon seeing a merge commit. This option
@@ -757,7 +757,7 @@
the individual commits brought in to your history by such
a merge.</p>
</dd>
-<dt class="hdlist1">--exclude-first-parent-only</dt>
+<dt class="hdlist1"><code>--exclude-first-parent-only</code></dt>
<dd>
<p>When finding commits to exclude (with a <em>^</em>), follow only
the first parent commit upon seeing a merge commit.
@@ -765,7 +765,7 @@
from the point where it diverged from the remote branch, given
that arbitrary merges can be valid topic branch changes.</p>
</dd>
-<dt class="hdlist1">--not</dt>
+<dt class="hdlist1"><code>--not</code></dt>
<dd>
<p>Reverses the meaning of the <em>^</em> prefix (or lack thereof)
for all following revision specifiers, up to the next <code>--not</code>.
@@ -774,40 +774,40 @@
via standard input, the revisions passed on the command line will
not be affected by it.</p>
</dd>
-<dt class="hdlist1">--all</dt>
+<dt class="hdlist1"><code>--all</code></dt>
<dd>
<p>Pretend as if all the refs in <code>refs/</code>, along with <code>HEAD</code>, are
listed on the command line as <em><commit></em>.</p>
</dd>
-<dt class="hdlist1">--branches[=<pattern>]</dt>
+<dt class="hdlist1"><code>--branches</code>[<code>=</code><em><pattern></em>]</dt>
<dd>
<p>Pretend as if all the refs in <code>refs/heads</code> are listed
on the command line as <em><commit></em>. If <em><pattern></em> is given, limit
-branches to ones matching given shell glob. If pattern lacks <em>?</em>,
+branches to ones matching given shell glob. If <em><pattern></em> lacks <em>?</em>,
<em>*</em>, or <em>[</em>, <em>/*</em> at the end is implied.</p>
</dd>
-<dt class="hdlist1">--tags[=<pattern>]</dt>
+<dt class="hdlist1"><code>--tags</code>[<code>=</code><em><pattern></em>]</dt>
<dd>
<p>Pretend as if all the refs in <code>refs/tags</code> are listed
on the command line as <em><commit></em>. If <em><pattern></em> is given, limit
tags to ones matching given shell glob. If pattern lacks <em>?</em>, <em>*</em>,
or <em>[</em>, <em>/*</em> at the end is implied.</p>
</dd>
-<dt class="hdlist1">--remotes[=<pattern>]</dt>
+<dt class="hdlist1"><code>--remotes</code>[<code>=</code><em><pattern></em>]</dt>
<dd>
<p>Pretend as if all the refs in <code>refs/remotes</code> are listed
on the command line as <em><commit></em>. If <em><pattern></em> is given, limit
remote-tracking branches to ones matching given shell glob.
If pattern lacks <em>?</em>, <em>*</em>, or <em>[</em>, <em>/*</em> at the end is implied.</p>
</dd>
-<dt class="hdlist1">--glob=<glob-pattern></dt>
+<dt class="hdlist1"><code>--glob=</code><em><glob-pattern></em></dt>
<dd>
<p>Pretend as if all the refs matching shell glob <em><glob-pattern></em>
are listed on the command line as <em><commit></em>. Leading <em>refs/</em>,
is automatically prepended if missing. If pattern lacks <em>?</em>, <em>*</em>,
or <em>[</em>, <em>/*</em> at the end is implied.</p>
</dd>
-<dt class="hdlist1">--exclude=<glob-pattern></dt>
+<dt class="hdlist1"><code>--exclude=</code><em><glob-pattern></em></dt>
<dd>
<p>Do not include refs matching <em><glob-pattern></em> that the next <code>--all</code>,
<code>--branches</code>, <code>--tags</code>, <code>--remotes</code>, or <code>--glob</code> would otherwise
@@ -823,7 +823,7 @@
explicitly.</p>
</div>
</dd>
-<dt class="hdlist1">--exclude-hidden=[fetch|receive|uploadpack]</dt>
+<dt class="hdlist1"><code>--exclude-hidden=</code>(<code>fetch</code>|<code>receive</code>|<code>uploadpack</code>)</dt>
<dd>
<p>Do not include refs that would be hidden by <code>git-fetch</code>,
<code>git-receive-pack</code> or <code>git-upload-pack</code> by consulting the appropriate
@@ -832,12 +832,12 @@
<a href="git-config.html">git-config(1)</a>). This option affects the next pseudo-ref option
<code>--all</code> or <code>--glob</code> and is cleared after processing them.</p>
</dd>
-<dt class="hdlist1">--reflog</dt>
+<dt class="hdlist1"><code>--reflog</code></dt>
<dd>
<p>Pretend as if all objects mentioned by reflogs are listed on the
command line as <em><commit></em>.</p>
</dd>
-<dt class="hdlist1">--alternate-refs</dt>
+<dt class="hdlist1"><code>--alternate-refs</code></dt>
<dd>
<p>Pretend as if all objects mentioned as ref tips of alternate
repositories were listed on the command line. An alternate
@@ -846,7 +846,7 @@
be modified by <code>core.alternateRefsCommand</code>, etc. See
<a href="git-config.html">git-config(1)</a>.</p>
</dd>
-<dt class="hdlist1">--single-worktree</dt>
+<dt class="hdlist1"><code>--single-worktree</code></dt>
<dd>
<p>By default, all working trees will be examined by the
following options when there are more than one (see
@@ -855,19 +855,19 @@
This option forces them to examine the current working tree
only.</p>
</dd>
-<dt class="hdlist1">--ignore-missing</dt>
+<dt class="hdlist1"><code>--ignore-missing</code></dt>
<dd>
<p>Upon seeing an invalid object name in the input, pretend as if
the bad input was not given.</p>
</dd>
-<dt class="hdlist1">--bisect</dt>
+<dt class="hdlist1"><code>--bisect</code></dt>
<dd>
<p>Pretend as if the bad bisection ref <code>refs/bisect/bad</code>
was listed and as if it was followed by <code>--not</code> and the good
bisection refs <code>refs/bisect/good-*</code> on the command
line.</p>
</dd>
-<dt class="hdlist1">--stdin</dt>
+<dt class="hdlist1"><code>--stdin</code></dt>
<dd>
<p>In addition to getting arguments from the command line, read
them from standard input as well. This accepts commits and
@@ -877,12 +877,12 @@
are only respected for arguments passed in the same way and will not
influence any subsequent command line arguments.</p>
</dd>
-<dt class="hdlist1">--cherry-mark</dt>
+<dt class="hdlist1"><code>--cherry-mark</code></dt>
<dd>
<p>Like <code>--cherry-pick</code> (see below) but mark equivalent commits
with <code>=</code> rather than omitting them, and inequivalent ones with <code>+</code>.</p>
</dd>
-<dt class="hdlist1">--cherry-pick</dt>
+<dt class="hdlist1"><code>--cherry-pick</code></dt>
<dd>
<p>Omit any commit that introduces the same change as
another commit on the “other side” when the set of
@@ -897,8 +897,8 @@
excluded from the output.</p>
</div>
</dd>
-<dt class="hdlist1">--left-only</dt>
-<dt class="hdlist1">--right-only</dt>
+<dt class="hdlist1"><code>--left-only</code></dt>
+<dt class="hdlist1"><code>--right-only</code></dt>
<dd>
<p>List only commits on the respective side of a symmetric difference,
i.e. only those which would be marked < resp. > by
@@ -911,7 +911,7 @@
list.</p>
</div>
</dd>
-<dt class="hdlist1">--cherry</dt>
+<dt class="hdlist1"><code>--cherry</code></dt>
<dd>
<p>A synonym for <code>--right-only</code> <code>--cherry-mark</code> <code>--no-merges</code>; useful to
limit the output to the commits on our side and mark those that
@@ -919,14 +919,14 @@
<code>git</code> <code>log</code> <code>--cherry</code> <code>upstream</code><code>...</code><code>mybranch</code>, similar to
<code>git</code> <code>cherry</code> <code>upstream</code> <code>mybranch</code>.</p>
</dd>
-<dt class="hdlist1">-g</dt>
-<dt class="hdlist1">--walk-reflogs</dt>
+<dt class="hdlist1"><code>-g</code></dt>
+<dt class="hdlist1"><code>--walk-reflogs</code></dt>
<dd>
<p>Instead of walking the commit ancestry chain, walk
reflog entries from the most recent one to older ones.
When this option is used you cannot specify commits to
-exclude (that is, <em>^commit</em>, <em>commit1..commit2</em>,
-and <em>commit1...commit2</em> notations cannot be used).</p>
+exclude (that is, <code>^</code><em><commit></em>, <em><commit1></em><code>..</code><em><commit2></em>,
+and <em><commit1></em><code>...</code><em><commit2></em> notations cannot be used).</p>
<div class="paragraph">
<p>With <code>--pretty</code> format other than <code>oneline</code> and <code>reference</code> (for obvious reasons),
this causes the output to have two extra lines of information
@@ -968,7 +968,7 @@
<p>Under <code>--pretty=reference</code>, this information will not be shown at all.</p>
</div>
</dd>
-<dt class="hdlist1">--merge</dt>
+<dt class="hdlist1"><code>--merge</code></dt>
<dd>
<p>Show commits touching conflicted paths in the range <code>HEAD</code><code>...</code><em><other></em>,
where <em><other></em> is the first existing pseudoref in <code>MERGE_HEAD</code>,
@@ -976,7 +976,7 @@
when the index has unmerged entries. This option can be used to show
relevant commits when resolving conflicts from a 3-way merge.</p>
</dd>
-<dt class="hdlist1">--boundary</dt>
+<dt class="hdlist1"><code>--boundary</code></dt>
<dd>
<p>Output excluded boundary commits. Boundary commits are
prefixed with <code>-</code>.</p>
@@ -997,11 +997,11 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1"><paths></dt>
+<dt class="hdlist1"><em><paths></em></dt>
<dd>
<p>Commits modifying the given <paths> are selected.</p>
</dd>
-<dt class="hdlist1">--simplify-by-decoration</dt>
+<dt class="hdlist1"><code>--simplify-by-decoration</code></dt>
<dd>
<p>Commits that are referred by some branch or tag are selected.</p>
</dd>
@@ -1015,47 +1015,47 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">Default mode</dt>
+<dt class="hdlist1"><code>Default</code> <code>mode</code></dt>
<dd>
<p>Simplifies the history to the simplest history explaining the
final state of the tree. Simplest because it prunes some side
branches if the end result is the same (i.e. merging branches
with the same content)</p>
</dd>
-<dt class="hdlist1">--show-pulls</dt>
+<dt class="hdlist1"><code>--show-pulls</code></dt>
<dd>
<p>Include all commits from the default mode, but also any merge
commits that are not TREESAME to the first parent but are
TREESAME to a later parent. This mode is helpful for showing
the merge commits that "first introduced" a change to a branch.</p>
</dd>
-<dt class="hdlist1">--full-history</dt>
+<dt class="hdlist1"><code>--full-history</code></dt>
<dd>
<p>Same as the default mode, but does not prune some history.</p>
</dd>
-<dt class="hdlist1">--dense</dt>
+<dt class="hdlist1"><code>--dense</code></dt>
<dd>
<p>Only the selected commits are shown, plus some to have a
meaningful history.</p>
</dd>
-<dt class="hdlist1">--sparse</dt>
+<dt class="hdlist1"><code>--sparse</code></dt>
<dd>
<p>All commits in the simplified history are shown.</p>
</dd>
-<dt class="hdlist1">--simplify-merges</dt>
+<dt class="hdlist1"><code>--simplify-merges</code></dt>
<dd>
<p>Additional option to <code>--full-history</code> to remove some needless
merges from the resulting history, as there are no selected
commits contributing to this merge.</p>
</dd>
-<dt class="hdlist1">--ancestry-path[=<commit>]</dt>
+<dt class="hdlist1"><code>--ancestry-path</code>[<code>=</code><em><commit></em>]</dt>
<dd>
-<p>When given a range of commits to display (e.g. <em>commit1..commit2</em>
-or <em>commit2 ^commit1</em>), and a commit <commit> in that range,
+<p>When given a range of commits to display (e.g. <em><commit1></em><code>..</code><em><commit2></em>
+or <em><commit2></em> <code>^</code><em><commit1></em>), and a commit <em><commit></em> in that range,
only display commits in that range
-that are ancestors of <commit>, descendants of <commit>, or
-<commit> itself. If no commit is specified, use <em>commit1</em> (the
-excluded part of the range) as <commit>. Can be passed multiple
+that are ancestors of <em><commit></em>, descendants of <em><commit></em>, or
+<em><commit></em> itself. If no commit is specified, use <em><commit1></em> (the
+excluded part of the range) as <em><commit></em>. Can be passed multiple
times; if so, a commit is included if it is any of the commits
given or if it is an ancestor or descendant of one of them.</p>
</dd>
@@ -1065,7 +1065,7 @@
<p>A more detailed explanation follows.</p>
</div>
<div class="paragraph">
-<p>Suppose you specified <code>foo</code> as the <paths>. We shall call commits
+<p>Suppose you specified <code>foo</code> as the <em><paths></em>. We shall call commits
that modify <code>foo</code> !TREESAME, and the rest TREESAME. (In a diff
filtered for <code>foo</code>, they look different and equal, respectively.)</p>
</div>
@@ -1091,27 +1091,27 @@
<ul>
<li>
<p><code>I</code> is the initial commit, in which <code>foo</code> exists with contents
-“asdf”, and a file <code>quux</code> exists with contents “quux”. Initial
+<code>asdf</code>, and a file <code>quux</code> exists with contents <code>quux</code>. Initial
commits are compared to an empty tree, so <code>I</code> is !TREESAME.</p>
</li>
<li>
-<p>In <code>A</code>, <code>foo</code> contains just “foo”.</p>
+<p>In <code>A</code>, <code>foo</code> contains just <code>foo</code>.</p>
</li>
<li>
<p><code>B</code> contains the same change as <code>A</code>. Its merge <code>M</code> is trivial and
hence TREESAME to all parents.</p>
</li>
<li>
-<p><code>C</code> does not change <code>foo</code>, but its merge <code>N</code> changes it to “foobar”,
+<p><code>C</code> does not change <code>foo</code>, but its merge <code>N</code> changes it to <code>foobar</code>,
so it is not TREESAME to any parent.</p>
</li>
<li>
-<p><code>D</code> sets <code>foo</code> to “baz”. Its merge <code>O</code> combines the strings from
-<code>N</code> and <code>D</code> to “foobarbaz”; i.e., it is not TREESAME to any parent.</p>
+<p><code>D</code> sets <code>foo</code> to <code>baz</code>. Its merge <code>O</code> combines the strings from
+<code>N</code> and <code>D</code> to <code>foobarbaz</code>; i.e., it is not TREESAME to any parent.</p>
</li>
<li>
-<p><code>E</code> changes <code>quux</code> to “xyzzy”, and its merge <code>P</code> combines the
-strings to “quux xyzzy”. <code>P</code> is TREESAME to <code>O</code>, but not to <code>E</code>.</p>
+<p><code>E</code> changes <code>quux</code> to <code>xyzzy</code>, and its merge <code>P</code> combines the
+strings to <code>quux</code> <code>xyzzy</code>. <code>P</code> is TREESAME to <code>O</code>, but not to <code>E</code>.</p>
</li>
<li>
<p><code>X</code> is an independent root commit that added a new file <code>side</code>, and <code>Y</code>
@@ -1158,7 +1158,7 @@
parent lines.</p>
</div>
</dd>
-<dt class="hdlist1">--full-history without parent rewriting</dt>
+<dt class="hdlist1"><code>--full-history</code> without parent rewriting</dt>
<dd>
<p>This mode differs from the default in one point: always follow
all parents of a merge, even if it is TREESAME to one of them.
@@ -1181,7 +1181,7 @@
them disconnected.</p>
</div>
</dd>
-<dt class="hdlist1">--full-history with parent rewriting</dt>
+<dt class="hdlist1"><code>--full-history</code> with parent rewriting</dt>
<dd>
<p>Ordinary commits are only included if they are !TREESAME
(though this can be changed, see <code>--sparse</code> below).</p>
@@ -1214,12 +1214,12 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--dense</dt>
+<dt class="hdlist1"><code>--dense</code></dt>
<dd>
<p>Commits that are walked are included if they are not TREESAME
to any parent.</p>
</dd>
-<dt class="hdlist1">--sparse</dt>
+<dt class="hdlist1"><code>--sparse</code></dt>
<dd>
<p>All commits that are walked are included.</p>
<div class="paragraph">
@@ -1228,7 +1228,7 @@
sides of the merge are never walked.</p>
</div>
</dd>
-<dt class="hdlist1">--simplify-merges</dt>
+<dt class="hdlist1"><code>--simplify-merges</code></dt>
<dd>
<p>First, build a history graph in the same way that
<code>--full-history</code> with parent rewriting does (see above).</p>
@@ -1303,10 +1303,10 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--ancestry-path[=<commit>]</dt>
+<dt class="hdlist1"><code>--ancestry-path</code>[<code>=</code><em><commit></em>]</dt>
<dd>
<p>Limit the displayed commits to those which are an ancestor of
-<commit>, or which are a descendant of <commit>, or are <commit>
+<em><commit></em>, or which are a descendant of <em><commit></em>, or are <em><commit></em>
itself.</p>
<div class="paragraph">
<p>As an example use case, consider the following commit history:</p>
@@ -1324,16 +1324,16 @@
<p>A regular <em>D..M</em> computes the set of commits that are ancestors of <code>M</code>,
but excludes the ones that are ancestors of <code>D</code>. This is useful to see
what happened to the history leading to <code>M</code> since <code>D</code>, in the sense
-that “what does <code>M</code> have that did not exist in <code>D</code>”. The result in this
+that "what does <code>M</code> have that did not exist in <code>D</code>". The result in this
example would be all the commits, except <code>A</code> and <code>B</code> (and <code>D</code> itself,
of course).</p>
</div>
<div class="paragraph">
<p>When we want to find out what commits in <code>M</code> are contaminated with the
bug introduced by <code>D</code> and need fixing, however, we might want to view
-only the subset of <em>D..M</em> that are actually descendants of <code>D</code>, i.e.
+only the subset of <code>D</code><code>..</code><code>M</code> that are actually descendants of <code>D</code>, i.e.
excluding <code>C</code> and <code>K</code>. This is exactly what the <code>--ancestry-path</code>
-option does. Applied to the <em>D..M</em> range, it results in:</p>
+option does. Applied to the <code>D</code><code>..</code><code>M</code> range, it results in:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -1346,7 +1346,7 @@
</div>
<div class="paragraph">
<p>We can also use <code>--ancestry-path=D</code> instead of <code>--ancestry-path</code> which
-means the same thing when applied to the <em>D..M</em> range but is just more
+means the same thing when applied to the <code>D</code><code>..</code><code>M</code> range but is just more
explicit.</p>
</div>
<div class="paragraph">
@@ -1484,7 +1484,7 @@
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1">--show-pulls</dt>
+<dt class="hdlist1"><code>--show-pulls</code></dt>
<dd>
<p>In addition to the commits shown in the default history, show
each merge commit that is not TREESAME to its first parent but
@@ -1565,7 +1565,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/git-show.html b/git-show.html
index 50cf6f4..b9cf6b6 100644
--- a/git-show.html
+++ b/git-show.html
@@ -497,47 +497,56 @@
For a more complete list of ways to spell object names, see
"SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(7)</a>.</p>
</dd>
-<dt class="hdlist1">--pretty[=<format>]</dt>
-<dt class="hdlist1">--format=<format></dt>
+<dt class="hdlist1"><code>--pretty</code>[<code>=</code><em><format></em>]</dt>
+<dt class="hdlist1"><code>--format=</code><em><format></em></dt>
<dd>
<p>Pretty-print the contents of the commit logs in a given format,
-where <em><format></em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,
-<em>full</em>, <em>fuller</em>, <em>reference</em>, <em>email</em>, <em>raw</em>, <em>format:<string></em>
-and <em>tformat:<string></em>. When <em><format></em> is none of the above,
-and has <em>%placeholder</em> in it, it acts as if
-<em>--pretty=tformat:<format></em> were given.</p>
+where <em><format></em> can be one of <code>oneline</code>, <code>short</code>, <code>medium</code>,
+<code>full</code>, <code>fuller</code>, <code>reference</code>, <code>email</code>, <code>raw</code>, <code>format:</code><em><string></em>
+and <code>tformat:</code><em><string></em>. When <em><format></em> is none of the above,
+and has <code>%</code><em><placeholder></em> in it, it acts as if
+<code>--pretty=tformat:</code><em><format></em> were given.</p>
<div class="paragraph">
<p>See the "PRETTY FORMATS" section for some additional details for each
-format. When <em>=<format></em> part is omitted, it defaults to <em>medium</em>.</p>
+format. When <code>=</code><em><format></em> part is omitted, it defaults to <code>medium</code>.</p>
</div>
-<div class="paragraph">
-<p>Note: you can specify the default pretty format in the repository
-configuration (see <a href="git-config.html">git-config(1)</a>).</p>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+you can specify the default pretty format in the repository
+configuration (see <a href="git-config.html">git-config(1)</a>).
+</td>
+</tr>
+</table>
</div>
</dd>
-<dt class="hdlist1">--abbrev-commit</dt>
+<dt class="hdlist1"><code>--abbrev-commit</code></dt>
<dd>
<p>Instead of showing the full 40-byte hexadecimal commit object
name, show a prefix that names the object uniquely.
-"--abbrev=<n>" (which also modifies diff output, if it is displayed)
+<code>--abbrev=</code><em><n></em> (which also modifies diff output, if it is displayed)
option can be used to specify the minimum length of the prefix.</p>
<div class="paragraph">
-<p>This should make "--pretty=oneline" a whole lot more readable for
+<p>This should make <code>--pretty=oneline</code> a whole lot more readable for
people using 80-column terminals.</p>
</div>
</dd>
-<dt class="hdlist1">--no-abbrev-commit</dt>
+<dt class="hdlist1"><code>--no-abbrev-commit</code></dt>
<dd>
<p>Show the full 40-byte hexadecimal commit object name. This negates
<code>--abbrev-commit</code>, either explicit or implied by other options such
-as "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.</p>
+as <code>--oneline</code>. It also overrides the <code>log.abbrevCommit</code> variable.</p>
</dd>
-<dt class="hdlist1">--oneline</dt>
+<dt class="hdlist1"><code>--oneline</code></dt>
<dd>
-<p>This is a shorthand for "--pretty=oneline --abbrev-commit"
+<p>This is a shorthand for <code>--pretty=oneline</code> <code>--abbrev-commit</code>
used together.</p>
</dd>
-<dt class="hdlist1">--encoding=<encoding></dt>
+<dt class="hdlist1"><code>--encoding=</code><em><encoding></em></dt>
<dd>
<p>Commit objects record the character encoding used for the log message
in their encoding header; this option can be used to tell the
@@ -550,9 +559,9 @@
to convert the commit, we will quietly output the original
object verbatim.</p>
</dd>
-<dt class="hdlist1">--expand-tabs=<n></dt>
-<dt class="hdlist1">--expand-tabs</dt>
-<dt class="hdlist1">--no-expand-tabs</dt>
+<dt class="hdlist1"><code>--expand-tabs=</code><em><n></em></dt>
+<dt class="hdlist1"><code>--expand-tabs</code></dt>
+<dt class="hdlist1"><code>--no-expand-tabs</code></dt>
<dd>
<p>Perform a tab expansion (replace each tab with enough spaces
to fill to the next display column that is a multiple of <em><n></em>)
@@ -562,11 +571,11 @@
which disables tab expansion.</p>
<div class="paragraph">
<p>By default, tabs are expanded in pretty formats that indent the log
-message by 4 spaces (i.e. <em>medium</em>, which is the default, <em>full</em>,
-and <em>fuller</em>).</p>
+message by 4 spaces (i.e. <code>medium</code>, which is the default, <code>full</code>,
+and <code>fuller</code>).</p>
</div>
</dd>
-<dt class="hdlist1">--notes[=<ref>]</dt>
+<dt class="hdlist1"><code>--notes</code>[<code>=</code><em><ref></em>]</dt>
<dd>
<p>Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the
commit, when showing the commit log message. This is the default
@@ -585,32 +594,33 @@
<code>refs/notes/</code> is prefixed to form the full name of the ref.</p>
</div>
<div class="paragraph">
-<p>Multiple --notes options can be combined to control which notes are
-being displayed. Examples: "--notes=foo" will show only notes from
-"refs/notes/foo"; "--notes=foo --notes" will show both notes from
+<p>Multiple <code>--notes</code> options can be combined to control which notes are
+being displayed. Examples: "<code>--notes=foo</code>" will show only notes from
+<code>refs/notes/foo</code>; "<code>--notes=foo</code> <code>--notes</code>" will show both notes from
"refs/notes/foo" and from the default notes ref(s).</p>
</div>
</dd>
-<dt class="hdlist1">--no-notes</dt>
+<dt class="hdlist1"><code>--no-notes</code></dt>
<dd>
<p>Do not show notes. This negates the above <code>--notes</code> option, by
resetting the list of notes refs from which notes are shown.
Options are parsed in the order given on the command line, so e.g.
-"--notes --notes=foo --no-notes --notes=bar" will only show notes
-from "refs/notes/bar".</p>
+"<code>--notes</code> <code>--notes=foo</code> <code>--no-notes</code> <code>--notes=bar</code>" will only show notes
+from <code>refs/notes/bar</code>.</p>
</dd>
-<dt class="hdlist1">--show-notes-by-default</dt>
+<dt class="hdlist1"><code>--show-notes-by-default</code></dt>
<dd>
<p>Show the default notes unless options for displaying specific
notes are given.</p>
</dd>
-<dt class="hdlist1">--show-notes[=<ref>]</dt>
-<dt class="hdlist1">--[no-]standard-notes</dt>
+<dt class="hdlist1"><code>--show-notes</code>[<code>=</code><em><ref></em>]</dt>
+<dt class="hdlist1"><code>--standard-notes</code></dt>
+<dt class="hdlist1"><code>--no-standard-notes</code></dt>
<dd>
-<p>These options are deprecated. Use the above --notes/--no-notes
+<p>These options are deprecated. Use the above <code>--notes</code>/<code>--no-notes</code>
options instead.</p>
</dd>
-<dt class="hdlist1">--show-signature</dt>
+<dt class="hdlist1"><code>--show-signature</code></dt>
<dd>
<p>Check the validity of a signed commit object by passing the signature
to <code>gpg</code> <code>--verify</code> and show the output.</p>
@@ -624,11 +634,11 @@
<div class="sectionbody">
<div class="paragraph">
<p>If the commit is a merge, and if the pretty-format
-is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
-inserted before the <em>Author:</em> line. This line begins with
+is not <code>oneline</code>, <code>email</code> or <code>raw</code>, an additional line is
+inserted before the <code>Author:</code> line. This line begins with
"Merge: " and the hashes of ancestral commits are printed,
separated by spaces. Note that the listed commits may not
-necessarily be the list of the <strong>direct</strong> parent commits if you
+necessarily be the list of the <em>direct</em> parent commits if you
have limited your view of history: for example, if you are
only interested in changes related to a certain directory or
file.</p>
@@ -637,14 +647,14 @@
<p>There are several built-in formats, and you can define
additional formats by setting a pretty.<name>
config option to either another format name, or a
-<em>format:</em> string, as described below (see
+<code>format:</code> string, as described below (see
<a href="git-config.html">git-config(1)</a>). Here are the details of the
built-in formats:</p>
</div>
<div class="ulist">
<ul>
<li>
-<p><em>oneline</em></p>
+<p><code>oneline</code></p>
<div class="literalblock">
<div class="content">
<pre><hash> <title-line></pre>
@@ -655,7 +665,7 @@
</div>
</li>
<li>
-<p><em>short</em></p>
+<p><code>short</code></p>
<div class="literalblock">
<div class="content">
<pre>commit <hash>
@@ -669,7 +679,7 @@
</div>
</li>
<li>
-<p><em>medium</em></p>
+<p><code>medium</code></p>
<div class="literalblock">
<div class="content">
<pre>commit <hash>
@@ -689,7 +699,7 @@
</div>
</li>
<li>
-<p><em>full</em></p>
+<p><code>full</code></p>
<div class="literalblock">
<div class="content">
<pre>commit <hash>
@@ -709,7 +719,7 @@
</div>
</li>
<li>
-<p><em>fuller</em></p>
+<p><code>fuller</code></p>
<div class="literalblock">
<div class="content">
<pre>commit <hash>
@@ -731,7 +741,7 @@
</div>
</li>
<li>
-<p><em>reference</em></p>
+<p><code>reference</code></p>
<div class="literalblock">
<div class="content">
<pre><abbrev-hash> (<title-line>, <short-author-date>)</pre>
@@ -739,7 +749,7 @@
</div>
<div class="paragraph">
<p>This format is used to refer to another commit in a commit message and
-is the same as <code>--pretty=</code>'format:%C(<code>auto</code>)%h (%s, %ad)'. By default,
+is the same as <code>--pretty=</code>'format:%C(<code>auto</code>)<code>%h</code> (<code>%s,</code> <code>%ad</code>)'. By default,
the date is formatted with <code>--date=short</code> unless another <code>--date</code> option
is explicitly specified. As with any <code>format:</code> with format
placeholders, its output is not affected by other options like
@@ -747,7 +757,7 @@
</div>
</li>
<li>
-<p><em>email</em></p>
+<p><code>email</code></p>
<div class="literalblock">
<div class="content">
<pre>From <hash> <date>
@@ -763,20 +773,20 @@
</div>
</li>
<li>
-<p><em>mboxrd</em></p>
+<p><code>mboxrd</code></p>
<div class="paragraph">
-<p>Like <em>email</em>, but lines in the commit message starting with "From "
+<p>Like <code>email</code>, but lines in the commit message starting with "From "
(preceded by zero or more ">") are quoted with ">" so they aren’t
confused as starting a new commit.</p>
</div>
</li>
<li>
-<p><em>raw</em></p>
+<p><code>raw</code></p>
<div class="paragraph">
-<p>The <em>raw</em> format shows the entire commit exactly as
+<p>The <code>raw</code> format shows the entire commit exactly as
stored in the commit object. Notably, the hashes are
-displayed in full, regardless of whether --abbrev or
---no-abbrev are used, and <em>parents</em> information show the
+displayed in full, regardless of whether <code>--abbrev</code> or
+<code>--no-abbrev</code> are used, and <em>parents</em> information show the
true parent commits, without taking grafts or history
simplification into account. Note that this format affects the way
commits are displayed, but not the way the diff is shown e.g. with
@@ -785,12 +795,12 @@
</div>
</li>
<li>
-<p><em>format:<format-string></em></p>
+<p><code>format:</code><em><format-string></em></p>
<div class="paragraph">
-<p>The <em>format:<format-string></em> format allows you to specify which information
+<p>The <code>format:</code><em><format-string></em> format allows you to specify which information
you want to show. It works a little bit like printf format,
-with the notable exception that you get a newline with <em>%n</em>
-instead of <em>\n</em>.</p>
+with the notable exception that you get a newline with <code>%n</code>
+instead of <code>\n</code>.</p>
</div>
<div class="paragraph">
<p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
@@ -811,17 +821,17 @@
<p>Placeholders that expand to a single literal character:</p>
<div class="dlist">
<dl>
-<dt class="hdlist1"><em>%n</em></dt>
+<dt class="hdlist1"><code>%n</code></dt>
<dd>
<p>newline</p>
</dd>
-<dt class="hdlist1"><em>%%</em></dt>
+<dt class="hdlist1"><code>%%</code></dt>
<dd>
-<p>a raw <em>%</em></p>
+<p>a raw <code>%</code></p>
</dd>
-<dt class="hdlist1"><em>%x00</em></dt>
+<dt class="hdlist1"><code>%x00</code></dt>
<dd>
-<p><em>%x</em> followed by two hexadecimal digits is replaced with a
+<p><code>%x</code> followed by two hexadecimal digits is replaced with a
byte with the hexadecimal digits' value (we will call this
"literal formatting code" in the rest of this document).</p>
</dd>
@@ -832,60 +842,60 @@
<p>Placeholders that affect formatting of later placeholders:</p>
<div class="dlist">
<dl>
-<dt class="hdlist1"><em>%Cred</em></dt>
+<dt class="hdlist1"><code>%Cred</code></dt>
<dd>
<p>switch color to red</p>
</dd>
-<dt class="hdlist1"><em>%Cgreen</em></dt>
+<dt class="hdlist1"><code>%Cgreen</code></dt>
<dd>
<p>switch color to green</p>
</dd>
-<dt class="hdlist1"><em>%Cblue</em></dt>
+<dt class="hdlist1"><code>%Cblue</code></dt>
<dd>
<p>switch color to blue</p>
</dd>
-<dt class="hdlist1"><em>%Creset</em></dt>
+<dt class="hdlist1"><code>%Creset</code></dt>
<dd>
<p>reset color</p>
</dd>
-<dt class="hdlist1"><em>%C(…​)</em></dt>
+<dt class="hdlist1"><code>%C</code>(<em><spec></em>)</dt>
<dd>
<p>color specification, as described under Values in the
"CONFIGURATION FILE" section of <a href="git-config.html">git-config(1)</a>. By
default, colors are shown only when enabled for log output
(by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and respecting
the <code>auto</code> settings of the former if we are going to a
-terminal). %C(<code>auto,</code><code>...</code>) is accepted as a historical
-synonym for the default (e.g., %C(<code>auto,red</code>)). Specifying
-%C(<code>always,</code><code>...</code>) will show the colors even when color is
+terminal). <code>%C</code>(<code>auto,</code><em><spec></em>) is accepted as a historical
+synonym for the default (e.g., <code>%C</code>(<code>auto,red</code>)). Specifying
+<code>%C</code>(<code>always,</code><em><spec></em>) will show the colors even when color is
not otherwise enabled (though consider just using
-<code>--color=always</code> to enable color for the whole output,
+<code>--color=always</code> to enable color for the whole output,
including this format and anything else git might color).
-<code>auto</code> alone (i.e. %C(<code>auto</code>)) will turn on auto coloring
+<code>auto</code> alone (i.e. <code>%C</code>(<code>auto</code>)) will turn on auto coloring
on the next placeholders until the color is switched
again.</p>
</dd>
-<dt class="hdlist1"><em>%m</em></dt>
+<dt class="hdlist1"><code>%m</code></dt>
<dd>
<p>left (<), right (>) or boundary (<code>-</code>) mark</p>
</dd>
-<dt class="hdlist1"><em>%w([<w>[,<i1>[,<i2>]]])</em></dt>
+<dt class="hdlist1"><code>%w</code>([<em><w></em>[<code>,</code><em><i1></em>[<code>,</code><em><i2></em>]]])</dt>
<dd>
-<p>switch line wrapping, like the -w option of
+<p>switch line wrapping, like the <code>-w</code> option of
<a href="git-shortlog.html">git-shortlog(1)</a>.</p>
</dd>
-<dt class="hdlist1"><em>%<( <N> [,trunc|ltrunc|mtrunc])</em></dt>
+<dt class="hdlist1"><code>%</code><(<em><n></em>[<code>,</code>(<code>trunc</code>|<code>ltrunc</code>|<code>mtrunc</code>)])</dt>
<dd>
<p>make the next placeholder take at
least N column widths, padding spaces on
the right if necessary. Optionally
-truncate (with ellipsis <em>..</em>) at the left (ltrunc) <code>..</code><code>ft</code>,
+truncate (with ellipsis <code>..</code>) at the left (ltrunc) <code>..</code><code>ft</code>,
the middle (mtrunc) <code>mi</code><code>..</code><code>le</code>, or the end
(trunc) <code>rig..</code>, if the output is longer than
-N columns.
+<em><n></em> columns.
Note 1: that truncating
-only works correctly with N >= 2.
-Note 2: spaces around the N and M (see below)
+only works correctly with <em><n></em> >= 2.
+Note 2: spaces around the <em><n></em> and <em><m></em> (see below)
values are optional.
Note 3: Emojis and other wide characters
will take two display columns, which may
@@ -893,29 +903,32 @@
Note 4: decomposed character combining marks
may be misplaced at padding boundaries.</p>
</dd>
-<dt class="hdlist1"><em>%<|( <M> )</em></dt>
+<dt class="hdlist1"><code>%</code><|(<em><m></em> )</dt>
<dd>
-<p>make the next placeholder take at least until Mth
+<p>make the next placeholder take at least until <em><m></em> th
display column, padding spaces on the right if necessary.
-Use negative M values for column positions measured
+Use negative <em><m></em> values for column positions measured
from the right hand edge of the terminal window.</p>
</dd>
-<dt class="hdlist1"><em>%>( <N> )</em>, <em>%>|( <M> )</em></dt>
+<dt class="hdlist1"><code>%</code>>(<em><n></em>)</dt>
+<dt class="hdlist1"><code>%</code>>|(<em><m></em>)</dt>
<dd>
-<p>similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em> respectively,
+<p>similar to <code>%</code><(<em><n></em>), <code>%</code><|(<em><m></em>) respectively,
but padding spaces on the left</p>
</dd>
-<dt class="hdlist1"><em>%>>( <N> )</em>, <em>%>>|( <M> )</em></dt>
+<dt class="hdlist1"><code>%</code>>>(<em><n></em>)</dt>
+<dt class="hdlist1"><code>%</code>>>|(<em><m></em>)</dt>
<dd>
-<p>similar to <em>%>( <N> )</em>, <em>%>|( <M> )</em>
+<p>similar to <code>%</code>>(<em><n></em>), <code>%</code>>|(<em><m></em>)
respectively, except that if the next
placeholder takes more spaces than given and
there are spaces on its left, use those
spaces</p>
</dd>
-<dt class="hdlist1"><em>%><( <N> )</em>, <em>%><|( <M> )</em></dt>
+<dt class="hdlist1"><code>%</code>><(<em><n></em>)</dt>
+<dt class="hdlist1"><code>%</code>><|(<em><m></em>)</dt>
<dd>
-<p>similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em>
+<p>similar to <code>%</code><(<em><n></em>), <code>%</code><|(<em><m></em>)
respectively, but padding both sides
(i.e. the text is centered)</p>
</dd>
@@ -926,181 +939,181 @@
<p>Placeholders that expand to information extracted from the commit:</p>
<div class="dlist">
<dl>
-<dt class="hdlist1"><em>%H</em></dt>
+<dt class="hdlist1"><code>%H</code></dt>
<dd>
<p>commit hash</p>
</dd>
-<dt class="hdlist1"><em>%h</em></dt>
+<dt class="hdlist1"><code>%h</code></dt>
<dd>
<p>abbreviated commit hash</p>
</dd>
-<dt class="hdlist1"><em>%T</em></dt>
+<dt class="hdlist1"><code>%T</code></dt>
<dd>
<p>tree hash</p>
</dd>
-<dt class="hdlist1"><em>%t</em></dt>
+<dt class="hdlist1"><code>%t</code></dt>
<dd>
<p>abbreviated tree hash</p>
</dd>
-<dt class="hdlist1"><em>%P</em></dt>
+<dt class="hdlist1"><code>%P</code></dt>
<dd>
<p>parent hashes</p>
</dd>
-<dt class="hdlist1"><em>%p</em></dt>
+<dt class="hdlist1"><code>%p</code></dt>
<dd>
<p>abbreviated parent hashes</p>
</dd>
-<dt class="hdlist1"><em>%an</em></dt>
+<dt class="hdlist1"><code>%an</code></dt>
<dd>
<p>author name</p>
</dd>
-<dt class="hdlist1"><em>%aN</em></dt>
+<dt class="hdlist1"><code>%aN</code></dt>
<dd>
<p>author name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a>
or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%ae</em></dt>
+<dt class="hdlist1"><code>%ae</code></dt>
<dd>
<p>author email</p>
</dd>
-<dt class="hdlist1"><em>%aE</em></dt>
+<dt class="hdlist1"><code>%aE</code></dt>
<dd>
<p>author email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a>
or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%al</em></dt>
+<dt class="hdlist1"><code>%al</code></dt>
<dd>
-<p>author email local-part (the part before the <em>@</em> sign)</p>
+<p>author email local-part (the part before the <code>@</code> sign)</p>
</dd>
-<dt class="hdlist1"><em>%aL</em></dt>
+<dt class="hdlist1"><code>%aL</code></dt>
<dd>
-<p>author local-part (see <em>%al</em>) respecting .mailmap, see
+<p>author local-part (see <code>%al</code>) respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%ad</em></dt>
+<dt class="hdlist1"><code>%ad</code></dt>
<dd>
<p>author date (format respects --date= option)</p>
</dd>
-<dt class="hdlist1"><em>%aD</em></dt>
+<dt class="hdlist1"><code>%aD</code></dt>
<dd>
<p>author date, RFC2822 style</p>
</dd>
-<dt class="hdlist1"><em>%ar</em></dt>
+<dt class="hdlist1"><code>%ar</code></dt>
<dd>
<p>author date, relative</p>
</dd>
-<dt class="hdlist1"><em>%at</em></dt>
+<dt class="hdlist1"><code>%at</code></dt>
<dd>
<p>author date, UNIX timestamp</p>
</dd>
-<dt class="hdlist1"><em>%ai</em></dt>
+<dt class="hdlist1"><code>%ai</code></dt>
<dd>
<p>author date, ISO 8601-like format</p>
</dd>
-<dt class="hdlist1"><em>%aI</em></dt>
+<dt class="hdlist1"><code>%aI</code></dt>
<dd>
<p>author date, strict ISO 8601 format</p>
</dd>
-<dt class="hdlist1"><em>%as</em></dt>
+<dt class="hdlist1"><code>%as</code></dt>
<dd>
<p>author date, short format (<code>YYYY-MM-DD</code>)</p>
</dd>
-<dt class="hdlist1"><em>%ah</em></dt>
+<dt class="hdlist1"><code>%ah</code></dt>
<dd>
<p>author date, human style (like the <code>--date=human</code> option of
<a href="git-rev-list.html">git-rev-list(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%cn</em></dt>
+<dt class="hdlist1"><code>%cn</code></dt>
<dd>
<p>committer name</p>
</dd>
-<dt class="hdlist1"><em>%cN</em></dt>
+<dt class="hdlist1"><code>%cN</code></dt>
<dd>
<p>committer name (respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%ce</em></dt>
+<dt class="hdlist1"><code>%ce</code></dt>
<dd>
<p>committer email</p>
</dd>
-<dt class="hdlist1"><em>%cE</em></dt>
+<dt class="hdlist1"><code>%cE</code></dt>
<dd>
<p>committer email (respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%cl</em></dt>
+<dt class="hdlist1"><code>%cl</code></dt>
<dd>
-<p>committer email local-part (the part before the <em>@</em> sign)</p>
+<p>committer email local-part (the part before the <code>@</code> sign)</p>
</dd>
-<dt class="hdlist1"><em>%cL</em></dt>
+<dt class="hdlist1"><code>%cL</code></dt>
<dd>
-<p>committer local-part (see <em>%cl</em>) respecting .mailmap, see
+<p>committer local-part (see <code>%cl</code>) respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%cd</em></dt>
+<dt class="hdlist1"><code>%cd</code></dt>
<dd>
<p>committer date (format respects --date= option)</p>
</dd>
-<dt class="hdlist1"><em>%cD</em></dt>
+<dt class="hdlist1"><code>%cD</code></dt>
<dd>
<p>committer date, RFC2822 style</p>
</dd>
-<dt class="hdlist1"><em>%cr</em></dt>
+<dt class="hdlist1"><code>%cr</code></dt>
<dd>
<p>committer date, relative</p>
</dd>
-<dt class="hdlist1"><em>%ct</em></dt>
+<dt class="hdlist1"><code>%ct</code></dt>
<dd>
<p>committer date, UNIX timestamp</p>
</dd>
-<dt class="hdlist1"><em>%ci</em></dt>
+<dt class="hdlist1"><code>%ci</code></dt>
<dd>
<p>committer date, ISO 8601-like format</p>
</dd>
-<dt class="hdlist1"><em>%cI</em></dt>
+<dt class="hdlist1"><code>%cI</code></dt>
<dd>
<p>committer date, strict ISO 8601 format</p>
</dd>
-<dt class="hdlist1"><em>%cs</em></dt>
+<dt class="hdlist1"><code>%cs</code></dt>
<dd>
<p>committer date, short format (<code>YYYY-MM-DD</code>)</p>
</dd>
-<dt class="hdlist1"><em>%ch</em></dt>
+<dt class="hdlist1"><code>%ch</code></dt>
<dd>
<p>committer date, human style (like the <code>--date=human</code> option of
<a href="git-rev-list.html">git-rev-list(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%d</em></dt>
+<dt class="hdlist1"><code>%d</code></dt>
<dd>
<p>ref names, like the --decorate option of <a href="git-log.html">git-log(1)</a></p>
</dd>
-<dt class="hdlist1"><em>%D</em></dt>
+<dt class="hdlist1"><code>%D</code></dt>
<dd>
<p>ref names without the " (", ")" wrapping.</p>
</dd>
-<dt class="hdlist1"><em>%(decorate[:<options>])</em></dt>
+<dt class="hdlist1"><code>%</code>(<code>decorate</code>[<code>:</code><em><option></em><code>,..</code>.])</dt>
<dd>
<p>ref names with custom decorations. The <code>decorate</code> string may be followed by a
colon and zero or more comma-separated options. Option values may contain
-literal formatting codes. These must be used for commas (%x2C) and closing
-parentheses (%x29), due to their role in the option syntax.</p>
+literal formatting codes. These must be used for commas (<code>%x2C</code>) and closing
+parentheses (<code>%x29</code>), due to their role in the option syntax.</p>
<div class="ulist">
<ul>
<li>
-<p><em>prefix=<value></em>: Shown before the list of ref names. Defaults to " (".</p>
+<p><code>prefix=</code><em><value></em>: Shown before the list of ref names. Defaults to " +(+".</p>
</li>
<li>
-<p><em>suffix=<value></em>: Shown after the list of ref names. Defaults to ")".</p>
+<p><code>suffix=</code><em><value></em>: Shown after the list of ref names. Defaults to ")".</p>
</li>
<li>
-<p><em>separator=<value></em>: Shown between ref names. Defaults to "<code>,</code> ".</p>
+<p><code>separator=</code><em><value></em>: Shown between ref names. Defaults to "<code>,</code> ".</p>
</li>
<li>
-<p><em>pointer=<value></em>: Shown between HEAD and the branch it points to, if any.
-Defaults to " <code>-</code>> ".</p>
+<p><code>pointer=</code><em><value></em>: Shown between HEAD and the branch it points to, if any.
+Defaults to " +→+ ".</p>
</li>
<li>
-<p><em>tag=<value></em>: Shown before tag names. Defaults to "<code>tag:</code> ".</p>
+<p><code>tag=</code><em><value></em>: Shown before tag names. Defaults to "<code>tag:</code> ".</p>
</li>
</ul>
</div>
@@ -1116,11 +1129,11 @@
</div>
<div class="paragraph">
<p>+
-%(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p>
+<code>%</code>(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p>
</div>
<div class="dlist">
<dl>
-<dt class="hdlist1"><em>%(describe[:<options>])</em></dt>
+<dt class="hdlist1"><code>%</code>(<code>describe</code>[<code>:</code><em><option></em><code>,..</code>.])</dt>
<dd>
<p>human-readable name, like <a href="git-describe.html">git-describe(1)</a>; empty string for
undescribable commits. The <code>describe</code> string may be followed by a colon and
@@ -1129,60 +1142,60 @@
<div class="ulist">
<ul>
<li>
-<p><em>tags[=<bool-value>]</em>: Instead of only considering annotated tags,
+<p><code>tags</code>[<code>=</code><em><bool-value></em>]: Instead of only considering annotated tags,
consider lightweight tags as well.</p>
</li>
<li>
-<p><em>abbrev=<number></em>: Instead of using the default number of hexadecimal digits
+<p><code>abbrev=</code><em><number></em>: Instead of using the default number of hexadecimal digits
(which will vary according to the number of objects in the repository with a
default of 7) of the abbreviated object name, use <number> digits, or as many
digits as needed to form a unique object name.</p>
</li>
<li>
-<p><em>match=<pattern></em>: Only consider tags matching the given
-<code>glob</code>(<code>7</code>) pattern, excluding the "refs/tags/" prefix.</p>
+<p><code>match=</code><em><pattern></em>: Only consider tags matching the given
+<code>glob</code>(<code>7</code>) <em><pattern></em>, excluding the <code>refs/tags/</code> prefix.</p>
</li>
<li>
-<p><em>exclude=<pattern></em>: Do not consider tags matching the given
-<code>glob</code>(<code>7</code>) pattern, excluding the "refs/tags/" prefix.</p>
+<p><code>exclude=</code><em><pattern></em>: Do not consider tags matching the given
+<code>glob</code>(<code>7</code>) <em><pattern></em>, excluding the <code>refs/tags/</code> prefix.</p>
</li>
</ul>
</div>
</dd>
-<dt class="hdlist1"><em>%S</em></dt>
+<dt class="hdlist1"><code>%S</code></dt>
<dd>
<p>ref name given on the command line by which the commit was reached
(like <code>git</code> <code>log</code> <code>--source</code>), only works with <code>git</code> <code>log</code></p>
</dd>
-<dt class="hdlist1"><em>%e</em></dt>
+<dt class="hdlist1"><code>%e</code></dt>
<dd>
<p>encoding</p>
</dd>
-<dt class="hdlist1"><em>%s</em></dt>
+<dt class="hdlist1"><code>%s</code></dt>
<dd>
<p>subject</p>
</dd>
-<dt class="hdlist1"><em>%f</em></dt>
+<dt class="hdlist1"><code>%f</code></dt>
<dd>
<p>sanitized subject line, suitable for a filename</p>
</dd>
-<dt class="hdlist1"><em>%b</em></dt>
+<dt class="hdlist1"><code>%b</code></dt>
<dd>
<p>body</p>
</dd>
-<dt class="hdlist1"><em>%B</em></dt>
+<dt class="hdlist1"><code>%B</code></dt>
<dd>
<p>raw body (unwrapped subject and body)</p>
</dd>
-<dt class="hdlist1"><em>%N</em></dt>
+<dt class="hdlist1"><code>%N</code></dt>
<dd>
<p>commit notes</p>
</dd>
-<dt class="hdlist1"><em>%GG</em></dt>
+<dt class="hdlist1"><code>%GG</code></dt>
<dd>
<p>raw verification message from GPG for a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%G?</em></dt>
+<dt class="hdlist1"><code>%G</code>?</dt>
<dd>
<p>show "G" for a good (valid) signature,
"B" for a bad signature,
@@ -1193,28 +1206,28 @@
"E" if the signature cannot be checked (e.g. missing key)
and "N" for no signature</p>
</dd>
-<dt class="hdlist1"><em>%GS</em></dt>
+<dt class="hdlist1"><code>%GS</code></dt>
<dd>
<p>show the name of the signer for a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%GK</em></dt>
+<dt class="hdlist1"><code>%GK</code></dt>
<dd>
<p>show the key used to sign a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%GF</em></dt>
+<dt class="hdlist1"><code>%GF</code></dt>
<dd>
<p>show the fingerprint of the key used to sign a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%GP</em></dt>
+<dt class="hdlist1"><code>%GP</code></dt>
<dd>
<p>show the fingerprint of the primary key whose subkey was used
to sign a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%GT</em></dt>
+<dt class="hdlist1"><code>%GT</code></dt>
<dd>
<p>show the trust level for the key used to sign a signed commit</p>
</dd>
-<dt class="hdlist1"><em>%gD</em></dt>
+<dt class="hdlist1"><code>%gD</code></dt>
<dd>
<p>reflog selector, e.g., <code>refs/stash@</code>{1} or <code>refs/stash@</code>{2
<code>minutes</code> <code>ago</code>}; the format follows the rules described for the
@@ -1222,35 +1235,35 @@
given on the command line (so <code>git</code> <code>log</code> <code>-g</code> <code>refs/heads/master</code>
would yield <code>refs/heads/master@</code>{0}).</p>
</dd>
-<dt class="hdlist1"><em>%gd</em></dt>
+<dt class="hdlist1"><code>%gd</code></dt>
<dd>
-<p>shortened reflog selector; same as %gD, but the refname
+<p>shortened reflog selector; same as <code>%gD</code>, but the refname
portion is shortened for human readability (so
<code>refs/heads/master</code> becomes just <code>master</code>).</p>
</dd>
-<dt class="hdlist1"><em>%gn</em></dt>
+<dt class="hdlist1"><code>%gn</code></dt>
<dd>
<p>reflog identity name</p>
</dd>
-<dt class="hdlist1"><em>%gN</em></dt>
+<dt class="hdlist1"><code>%gN</code></dt>
<dd>
<p>reflog identity name (respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%ge</em></dt>
+<dt class="hdlist1"><code>%ge</code></dt>
<dd>
<p>reflog identity email</p>
</dd>
-<dt class="hdlist1"><em>%gE</em></dt>
+<dt class="hdlist1"><code>%gE</code></dt>
<dd>
<p>reflog identity email (respecting .mailmap, see
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
</dd>
-<dt class="hdlist1"><em>%gs</em></dt>
+<dt class="hdlist1"><code>%gs</code></dt>
<dd>
<p>reflog subject</p>
</dd>
-<dt class="hdlist1"><em>%(trailers[:<options>])</em></dt>
+<dt class="hdlist1"><code>%</code>(<code>trailers</code>[<code>:</code><em><option></em><code>,..</code>.])</dt>
<dd>
<p>display the trailers of the body as interpreted by
<a href="git-interpret-trailers.html">git-interpret-trailers(1)</a>. The <code>trailers</code> string may be followed by
@@ -1259,43 +1272,43 @@
<div class="ulist">
<ul>
<li>
-<p><em>key=<key></em>: only show trailers with specified <key>. Matching is done
+<p><code>key=</code><em><key></em>: only show trailers with specified <key>. Matching is done
case-insensitively and trailing colon is optional. If option is
given multiple times trailer lines matching any of the keys are
shown. This option automatically enables the <code>only</code> option so that
non-trailer lines in the trailer block are hidden. If that is not
desired it can be disabled with <code>only=false</code>. E.g.,
-%(<code>trailers:key=Reviewed-by</code>) shows trailer lines with key
+<code>%</code>(<code>trailers:key=Reviewed-by</code>) shows trailer lines with key
<code>Reviewed-by</code>.</p>
</li>
<li>
-<p><em>only[=<bool>]</em>: select whether non-trailer lines from the trailer
+<p><code>only</code>[<code>=</code><em><bool></em>]: select whether non-trailer lines from the trailer
block should be included.</p>
</li>
<li>
-<p><em>separator=<sep></em>: specify the separator inserted between trailer
+<p><code>separator=</code><em><sep></em>: specify the separator inserted between trailer
lines. Defaults to a line feed character. The string <sep> may contain
the literal formatting codes described above. To use comma as
-separator one must use %x2C as it would otherwise be parsed as
-next option. E.g., %(<code>trailers:key=Ticket,separator=</code>%x2C )
+separator one must use <code>%x2C</code> as it would otherwise be parsed as
+next option. E.g., <code>%</code>(<code>trailers:key=Ticket,separator=%x2C</code> )
shows all trailer lines whose key is "Ticket" separated by a comma
and a space.</p>
</li>
<li>
-<p><em>unfold[=<bool>]</em>: make it behave as if interpret-trailer’s <code>--unfold</code>
+<p><code>unfold</code>[<code>=</code><em><bool></em>]: make it behave as if interpret-trailer’s <code>--unfold</code>
option was given. E.g.,
-%(<code>trailers:only,unfold=true</code>) unfolds and shows all trailer lines.</p>
+<code>%</code>(<code>trailers:only,unfold=true</code>) unfolds and shows all trailer lines.</p>
</li>
<li>
-<p><em>keyonly[=<bool>]</em>: only show the key part of the trailer.</p>
+<p><code>keyonly</code>[<code>=</code><em><bool></em>]: only show the key part of the trailer.</p>
</li>
<li>
-<p><em>valueonly[=<bool>]</em>: only show the value part of the trailer.</p>
+<p><code>valueonly</code>[<code>=</code><em><bool></em>]: only show the value part of the trailer.</p>
</li>
<li>
-<p><em>key_value_separator=<sep></em>: specify the separator inserted between
+<p><code>key_value_separator=</code><em><sep></em>: specify the separator inserted between
the key and value of each trailer. Defaults to ": ". Otherwise it
-shares the same semantics as <em>separator=<sep></em> above.</p>
+shares the same semantics as <code>separator=</code><em><sep></em> above.</p>
</li>
</ul>
</div>
@@ -1313,9 +1326,9 @@
</td>
<td class="content">
Some placeholders may depend on other options given to the
-revision traversal engine. For example, the %g* reflog options will
+revision traversal engine. For example, the <code>%g*</code> reflog options will
insert an empty string unless we are traversing reflog entries (e.g., by
-<code>git</code> <code>log</code> <code>-g</code>). The %d and %D placeholders will use the "short"
+<code>git</code> <code>log</code> <code>-g</code>). The <code>%d</code> and <code>%D</code> placeholders will use the "short"
decoration format if <code>--decorate</code> was not already provided on the command
line.
</td>
@@ -1324,31 +1337,31 @@
</div>
<div class="paragraph">
<p>The boolean options accept an optional value [<code>=</code><em><bool-value></em>]. The
-values taken by <code>--type=bool</code> git-config[1], like <code>yes</code> and <code>off</code>,
+values taken by <code>--type=bool</code> <a href="git-config.html">git-config(1)</a>, like <code>yes</code> and <code>off</code>,
are all accepted. Giving a boolean option without <code>=</code><em><value></em> is
equivalent to giving it with <code>=true</code>.</p>
</div>
<div class="paragraph">
-<p>If you add a <code>+</code> (plus sign) after <em>%</em> of a placeholder, a line-feed
+<p>If you add a <code>+</code> (plus sign) after <code>%</code> of a placeholder, a line-feed
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.</p>
</div>
<div class="paragraph">
-<p>If you add a <code>-</code> (minus sign) after <em>%</em> of a placeholder, all consecutive
+<p>If you add a <code>-</code> (minus sign) after <code>%</code> of a placeholder, all consecutive
line-feeds immediately preceding the expansion are deleted if and only if the
placeholder expands to an empty string.</p>
</div>
<div class="paragraph">
-<p>If you add a ` ` (space) after <em>%</em> of a placeholder, a space
+<p>If you add a ' ' (space) after <code>%</code> of a placeholder, a space
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.</p>
</div>
<div class="ulist">
<ul>
<li>
-<p><em>tformat:</em></p>
+<p><code>tformat:</code></p>
<div class="paragraph">
-<p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
+<p>The <code>tformat:</code> format works exactly like <code>format:</code>, except that it
provides "terminator" semantics instead of "separator" semantics. In
other words, each commit has the message terminator character (usually a
newline) appended, rather than a separator placed between entries.
@@ -1370,7 +1383,7 @@
</div>
</div>
<div class="paragraph">
-<p>In addition, any unrecognized string that has a % in it is interpreted
+<p>In addition, any unrecognized string that has a <code>%</code> in it is interpreted
as if it has <code>tformat:</code> in front of it. For example, these two are
equivalent:</p>
</div>
@@ -1408,38 +1421,38 @@
squelch their output, or to cancel the effect of options like
<code>--patch</code>, <code>--stat</code> earlier on the command line in an alias.</p>
</dd>
-<dt class="hdlist1">-m</dt>
+<dt class="hdlist1"><code>-m</code></dt>
<dd>
<p>Show diffs for merge commits in the default format. This is
similar to <code>--diff-merges=on</code>, except <code>-m</code> will
produce no output unless <code>-p</code> is given as well.</p>
</dd>
-<dt class="hdlist1">-c</dt>
+<dt class="hdlist1"><code>-c</code></dt>
<dd>
<p>Produce combined diff output for merge commits.
Shortcut for <code>--diff-merges=combined</code> <code>-p</code>.</p>
</dd>
-<dt class="hdlist1">--cc</dt>
+<dt class="hdlist1"><code>--cc</code></dt>
<dd>
<p>Produce dense combined diff output for merge commits.
Shortcut for <code>--diff-merges=dense-combined</code> <code>-p</code>.</p>
</dd>
-<dt class="hdlist1">--dd</dt>
+<dt class="hdlist1"><code>--dd</code></dt>
<dd>
<p>Produce diff with respect to first parent for both merge and
regular commits.
Shortcut for <code>--diff-merges=first-parent</code> <code>-p</code>.</p>
</dd>
-<dt class="hdlist1">--remerge-diff</dt>
+<dt class="hdlist1"><code>--remerge-diff</code></dt>
<dd>
<p>Produce remerge-diff output for merge commits.
Shortcut for <code>--diff-merges=remerge</code> <code>-p</code>.</p>
</dd>
-<dt class="hdlist1">--no-diff-merges</dt>
+<dt class="hdlist1"><code>--no-diff-merges</code></dt>
<dd>
<p>Synonym for <code>--diff-merges=off</code>.</p>
</dd>
-<dt class="hdlist1">--diff-merges=<format></dt>
+<dt class="hdlist1"><code>--diff-merges=</code><em><format></em></dt>
<dd>
<p>Specify diff format to be used for merge commits. Default is
`dense-combined` unless <code>--first-parent</code> is in use, in
@@ -1451,60 +1464,66 @@
<div class="content">
<div class="dlist">
<dl>
-<dt class="hdlist1">off, none</dt>
+<dt class="hdlist1"><code>off</code></dt>
+<dt class="hdlist1"><code>none</code></dt>
<dd>
<p>Disable output of diffs for merge commits. Useful to override
implied value.</p>
</dd>
-<dt class="hdlist1">on, m</dt>
+<dt class="hdlist1"><code>on</code></dt>
+<dt class="hdlist1"><code>m</code></dt>
<dd>
<p>Make diff output for merge commits to be shown in the default
format. The default format can be changed using
<code>log.diffMerges</code> configuration variable, whose default value
is <code>separate</code>.</p>
</dd>
-<dt class="hdlist1">first-parent, 1</dt>
+<dt class="hdlist1"><code>first-parent</code></dt>
+<dt class="hdlist1"><code>1</code></dt>
<dd>
<p>Show full diff with respect to first parent. This is the same
format as <code>--patch</code> produces for non-merge commits.</p>
</dd>
-<dt class="hdlist1">separate</dt>
+<dt class="hdlist1"><code>separate</code></dt>
<dd>
<p>Show full diff with respect to each of parents.
Separate log entry and diff is generated for each parent.</p>
</dd>
-<dt class="hdlist1">combined, c</dt>
+<dt class="hdlist1"><code>combined</code></dt>
+<dt class="hdlist1"><code>c</code></dt>
<dd>
<p>Show differences from each of the parents to the merge
result simultaneously instead of showing pairwise diff between
a parent and the result one at a time. Furthermore, it lists
only files which were modified from all parents.</p>
</dd>
-<dt class="hdlist1">dense-combined, cc</dt>
+<dt class="hdlist1"><code>dense-combined</code></dt>
+<dt class="hdlist1"><code>cc</code></dt>
<dd>
<p>Further compress output produced by <code>--diff-merges=combined</code>
by omitting uninteresting hunks whose contents in the parents
have only two variants and the merge result picks one of them
without modification.</p>
</dd>
-<dt class="hdlist1">remerge, r</dt>
+<dt class="hdlist1"><code>remerge</code></dt>
+<dt class="hdlist1"><code>r</code></dt>
<dd>
<p>Remerge two-parent merge commits to create a temporary tree
object—​potentially containing files with conflict markers
and such. A diff is then shown between that temporary tree
and the actual merge commit.</p>
+</dd>
+</dl>
+</div>
+</div>
+</div>
<div class="paragraph">
<p>The output emitted when this option is used is subject to change, and
so is its interaction with other options (unless explicitly
documented).</p>
</div>
</dd>
-</dl>
-</div>
-</div>
-</div>
-</dd>
-<dt class="hdlist1">--combined-all-paths</dt>
+<dt class="hdlist1"><code>--combined-all-paths</code></dt>
<dd>
<p>Cause combined diffs (used for merge commits) to
list the name of the file from all parents. It thus only has
@@ -2032,7 +2051,7 @@
few lines that happen to match textually as the context, but as a
single deletion of everything old followed by a single insertion of
everything new, and the number <em><m></em> controls this aspect of the <code>-B</code>
-option (defaults to 60%). <code>-B/70</code>% specifies that less than 30% of the
+option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
original should remain in the result for Git to consider it a total
rewrite (i.e. otherwise the resulting patch will be a series of
deletion and insertion mixed together with context lines).</p>
@@ -2041,7 +2060,7 @@
<p>When used with <code>-M</code>, a totally-rewritten file is also considered as the
source of a rename (usually <code>-M</code> only considers a file that disappeared
as the source of a rename), and the number <em><n></em> controls this aspect of
-the <code>-B</code> option (defaults to 50%). <code>-B20</code>% specifies that a change with
+the <code>-B</code> option (defaults to 50%). <code>-B20%</code> specifies that a change with
addition and deletion compared to 20% or more of the file’s size are
eligible for being picked up as a possible source of a rename to
another file.</p>
@@ -2055,13 +2074,13 @@
<code>--follow</code>.
If <em><n></em> is specified, it is a threshold on the similarity
index (i.e. amount of addition/deletions compared to the
-file’s size). For example, <code>-M90</code>% means Git should consider a
+file’s size). For example, <code>-M90%</code> means Git should consider a
delete/add pair to be a rename if more than 90% of the file
-hasn’t changed. Without a % sign, the number is to be read as
+hasn’t changed. Without a <code>%</code> sign, the number is to be read as
a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
-0.5, and is thus the same as <code>-M50</code>%. Similarly, <code>-M05</code> is
-the same as <code>-M5</code>%. To limit detection to exact renames, use
-<code>-M100</code>%. The default similarity index is 50%.</p>
+0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is
+the same as <code>-M5%</code>. To limit detection to exact renames, use
+<code>-M100%</code>. The default similarity index is 50%.</p>
</dd>
<dt class="hdlist1"><code>-C</code>[<em><n></em>]</dt>
<dt class="hdlist1"><code>--find-copies</code>[<code>=</code><em><n></em>]</dt>
@@ -2685,7 +2704,7 @@
<dd>
<p>Shows the tree pointed to by the tag <code>v1.0.0</code>.</p>
</dd>
-<dt class="hdlist1"><code>git</code> <code>show</code> <code>-s</code> <code>--format=</code>%s <code>v1.0.0^</code>{commit}</dt>
+<dt class="hdlist1"><code>git</code> <code>show</code> <code>-s</code> <code>--format=%s</code> <code>v1.0.0^</code>{commit}</dt>
<dd>
<p>Shows the subject of the commit pointed to by the
tag <code>v1.0.0</code>.</p>
@@ -2813,7 +2832,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/git-tag.html b/git-tag.html
index 33eeab4..a7da2aa 100644
--- a/git-tag.html
+++ b/git-tag.html
@@ -698,10 +698,10 @@
</dd>
<dt class="hdlist1">--format=<format></dt>
<dd>
-<p>A string that interpolates %(<code>fieldname</code>) from a tag ref being shown
+<p>A string that interpolates <code>%</code>(<code>fieldname</code>) from a tag ref being shown
and the object it points at. The format is the same as
that of <a href="git-for-each-ref.html">git-for-each-ref(1)</a>. When unspecified,
-defaults to %(<code>refname:strip=2</code>).</p>
+defaults to <code>%</code>(<code>refname:strip=2</code>).</p>
</dd>
<dt class="hdlist1"><tagname></dt>
<dd>
@@ -1015,7 +1015,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/gitattributes.html b/gitattributes.html
index 8327c80..fe83e23 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -1842,16 +1842,16 @@
</div>
<div class="paragraph">
<p>The <code>merge.*.driver</code> variable’s value is used to construct a
-command to run to common ancestor’s version (%O), current
-version (%A) and the other branches' version (%B). These
+command to run to common ancestor’s version (<code>%O</code>), current
+version (<code>%A</code>) and the other branches' version (<code>%B</code>). These
three tokens are replaced with the names of temporary files that
hold the contents of these versions when the command line is
-built. Additionally, %L will be replaced with the conflict marker
+built. Additionally, <code>%L</code> will be replaced with the conflict marker
size (see below).</p>
</div>
<div class="paragraph">
<p>The merge driver is expected to leave the result of the merge in
-the file named with %A by overwriting it, and exit with zero
+the file named with <code>%A</code> by overwriting it, and exit with zero
status if it managed to merge them cleanly, or non-zero if there
were conflicts. When the driver crashes (e.g. killed by SEGV),
it is expected to exit with non-zero status that are higher than
@@ -1867,9 +1867,9 @@
</div>
<div class="paragraph">
<p>The merge driver can learn the pathname in which the merged result
-will be stored via placeholder %P. The conflict labels to be used
+will be stored via placeholder <code>%P</code>. The conflict labels to be used
for the common ancestor, local head and other head can be passed by
-using %S, %X and %Y respectively.</p>
+using <code>%S</code>, <code>%X</code> and <code>%Y</code> respectively.</p>
</div>
</div>
<div class="sect3">
@@ -1948,8 +1948,8 @@
tag then no replacement will be done. The placeholders are the same
as those for the option <code>--pretty=format:</code> of <a href="git-log.html">git-log(1)</a>,
except that they need to be wrapped like this: <code>$Format:PLACEHOLDERS$</code>
-in the file. E.g. the string <code>$Format:</code>%H$ will be replaced by the
-commit hash. However, only one %(<code>describe</code>) placeholder is expanded
+in the file. E.g. the string <code>$Format:%H$</code> will be replaced by the
+commit hash. However, only one <code>%</code>(<code>describe</code>) placeholder is expanded
per archive to avoid denial-of-service attacks.</p>
</div>
</div>
@@ -2125,7 +2125,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-03-26 00:41:02 -0700
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/gitglossary.html b/gitglossary.html
index 63d9a43..f15118e 100644
--- a/gitglossary.html
+++ b/gitglossary.html
@@ -960,9 +960,8 @@
<li>
<p>A leading "<code>**</code>" followed by a slash means match in all
directories. For example, "<code>**/foo</code>" matches file or directory
-"<code>foo</code>" anywhere, the same as pattern "<code>foo</code>". "<code>**/foo/bar</code>"
-matches file or directory "<code>bar</code>" anywhere that is directly
-under directory "<code>foo</code>".</p>
+"<code>foo</code>" anywhere. "<code>**/foo/bar</code>" matches file or directory "<code>bar</code>"
+anywhere that is directly under directory "<code>foo</code>".</p>
</li>
<li>
<p>A trailing "<code>/**</code>" matches everything inside. For example,
@@ -1419,7 +1418,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/gitk.html b/gitk.html
index df309ef..e8e9129 100644
--- a/gitk.html
+++ b/gitk.html
@@ -552,10 +552,10 @@
(See "History simplification" in <a href="git-log.html">git-log(1)</a> for a more
detailed explanation.)</p>
</dd>
-<dt class="hdlist1">-L<start>,<end>:<file></dt>
-<dt class="hdlist1">-L:<funcname>:<file></dt>
+<dt class="hdlist1"><code>-L</code><em><start></em><code>,</code><em><end></em><code>:</code><em><file></em></dt>
+<dt class="hdlist1"><code>-L:</code><em><funcname></em><code>:</code><em><file></em></dt>
<dd>
-<p>Trace the evolution of the line range given by <em><start>,<end></em>,
+<p>Trace the evolution of the line range given by <em><start></em><code>,</code><em><end></em>,
or by the function name regex <em><funcname></em>, within the <em><file></em>. You may
not give any pathspec limiters. This is currently limited to
a walk starting from a single revision, i.e., you may only
@@ -571,25 +571,25 @@
<div class="ulist">
<ul>
<li>
-<p>number</p>
+<p><em><number></em></p>
<div class="paragraph">
<p>If <em><start></em> or <em><end></em> is a number, it specifies an
absolute line number (lines count from 1).</p>
</div>
</li>
<li>
-<p><code>/regex/</code></p>
+<p><code>/</code><em><regex></em><code>/</code></p>
<div class="paragraph">
<p>This form will use the first line matching the given
-POSIX regex. If <em><start></em> is a regex, it will search from the end of
+POSIX <em><regex></em>. If <em><start></em> is a regex, it will search from the end of
the previous <code>-L</code> range, if any, otherwise from the start of file.
-If <em><start></em> is <code>^/regex/</code>, it will search from the start of file.
-If <em><end></em> is a regex, it will search
-starting at the line given by <em><start></em>.</p>
+If <em><start></em> is <code>^/</code><em><regex></em><code>/</code>, it will search from the start of file.
+If <em><end></em> is a regex, it will search starting at the line given by
+<em><start></em>.</p>
</div>
</li>
<li>
-<p>+offset or -offset</p>
+<p><code>+</code><em><offset></em> or <code>-</code><em><offset></em></p>
<div class="paragraph">
<p>This is only valid for <em><end></em> and will specify a number
of lines before or after the line given by <em><start></em>.</p>
@@ -748,7 +748,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/gitweb.conf.html b/gitweb.conf.html
index 44c911a..7607319 100644
--- a/gitweb.conf.html
+++ b/gitweb.conf.html
@@ -566,7 +566,7 @@
perfectly well for some installations. Still, a configuration file is
useful for customizing or tweaking the behavior of gitweb in many ways, and
some optional features will not be present unless explicitly enabled using
-the configurable %features variable (see also "Configuring gitweb
+the configurable <code>%features</code> variable (see also "Configuring gitweb
features" section below).</p>
</div>
</div>
@@ -757,8 +757,8 @@
and that syntax must be supported by "highlight". The default syntax
detection is minimal, and there are many supported syntax types with no
detection by default. There are three options for adding syntax
-detection. The first and second priority are %highlight_basename and
-%highlight_ext, which detect based on basename (the full filename, for
+detection. The first and second priority are <code>%highlight_basename</code> and
+<code>%highlight_ext</code>, which detect based on basename (the full filename, for
example "Makefile") and extension (for example "sh"). The keys of these
hashes are the basename and extension, respectively, and the value for a
given key is the name of the syntax to be passed via <code>--syntax</code> <em><syntax></em>
@@ -1026,7 +1026,7 @@
<div class="sect2">
<h3 id="_some_optional_features_and_policies">Some optional features and policies</h3>
<div class="paragraph">
-<p>Most of features are configured via %feature hash; however some of extra
+<p>Most of features are configured via <code>%feature</code> hash; however some of extra
gitweb features can be turned on and configured using variables described
below. This list beside configuration variables that control how gitweb
looks does contain variables configuring administrative side of gitweb
@@ -1186,10 +1186,10 @@
<div class="sectionbody">
<div class="paragraph">
<p>Many gitweb features can be enabled (or disabled) and configured using the
-%feature hash. Names of gitweb features are keys of this hash.</p>
+<code>%feature</code> hash. Names of gitweb features are keys of this hash.</p>
</div>
<div class="paragraph">
-<p>Each %feature hash element is a hash reference and has the following
+<p>Each <code>%feature</code> hash element is a hash reference and has the following
structure:</p>
</div>
<div class="listingblock">
@@ -1203,7 +1203,7 @@
</div>
<div class="paragraph">
<p>Some features cannot be overridden per project. For those
-features the structure of appropriate %feature hash element has a simpler
+features the structure of appropriate <code>%feature</code> hash element has a simpler
form:</p>
</div>
<div class="listingblock">
@@ -1265,9 +1265,9 @@
</dl>
</div>
<div class="sect2">
-<h3 id="_features_in_feature">Features in %feature</h3>
+<h3 id="_features_in_feature">Features in <code>%feature</code></h3>
<div class="paragraph">
-<p>The gitweb features that are configurable via %feature hash are listed
+<p>The gitweb features that are configurable via <code>%feature</code> hash are listed
below. This should be a complete list, but ultimately the authoritative
and complete list is in gitweb.cgi source code, with features described
in the comments.</p>
@@ -1292,7 +1292,7 @@
This can potentially generate high traffic if you have large project.</p>
<div class="paragraph">
<p>The value of 'default' is a list of names of snapshot formats,
-defined in %known_snapshot_formats hash, that you wish to offer.
+defined in <code>%known_snapshot_formats</code> hash, that you wish to offer.
Supported formats include "tgz", "tbz2", "txz" (gzip/bzip2/xz
compressed tar archive) and "zip"; please consult gitweb sources for
a definitive list. By default only "tgz" is offered.</p>
@@ -1372,7 +1372,7 @@
repository’s <code>gitweb.avatar</code> configuration variable.</p>
</div>
<div class="paragraph">
-<p>See also %avatar_size with pixel sizes for icons and avatars
+<p>See also <code>%avatar_size</code> with pixel sizes for icons and avatars
("default" is used for one-line like "log" and "shortlog", "double"
is used for two-line like "commit", "commitdiff" or "tag"). If the
default font sizes or lineheights are changed (e.g. via adding extra
@@ -1458,11 +1458,11 @@
<div class="paragraph">
<p>The "default" value consists of a list of triplets in the form
("<em><label></em>", "<em><link></em>", "<em><position></em>") where "position" is the label
-after which to insert the link, "link" is a format string where %n
-expands to the project name, %f to the project path within the
-filesystem (i.e. "$projectroot/$project"), %h to the current hash
-('h' gitweb parameter) and %b to the current hash base
-('hb' gitweb parameter); %% expands to '%'.</p>
+after which to insert the link, "link" is a format string where <code>%n</code>
+expands to the project name, <code>%f</code> to the project path within the
+filesystem (i.e. "$projectroot/$project"), <code>%h</code> to the current hash
+('h' gitweb parameter) and <code>%b</code> to the current hash base
+('hb' gitweb parameter); <code>%%</code> expands to '%'.</p>
</div>
<div class="paragraph">
<p>For example, at the time this page was written, the <a href="https://repo.or.cz" class="bare">https://repo.or.cz</a>
@@ -1696,7 +1696,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-03-26 00:41:02 -0700
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/gitweb.html b/gitweb.html
index a96321d..e993b4b 100644
--- a/gitweb.html
+++ b/gitweb.html
@@ -799,7 +799,7 @@
</dd>
<dt class="hdlist1">various <code>gitweb.*</code> config variables (in config)</dt>
<dd>
-<p>Read description of %feature hash for detailed list, and descriptions.
+<p>Read description of <code>%feature</code> hash for detailed list, and descriptions.
See also "Configuring gitweb features" section in <a href="gitweb.conf.html">gitweb.conf(5)</a></p>
</dd>
</dl>
@@ -1379,7 +1379,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2025-03-26 00:41:02 -0700
+Last updated 2025-06-20 18:10:42 -0700
</div>
</div>
</body>
diff --git a/glossary-content.adoc b/glossary-content.adoc
index 575c18f..e423e47 100644
--- a/glossary-content.adoc
+++ b/glossary-content.adoc
@@ -418,9 +418,8 @@
- A leading "`**`" followed by a slash means match in all
directories. For example, "`**/foo`" matches file or directory
- "`foo`" anywhere, the same as pattern "`foo`". "`**/foo/bar`"
- matches file or directory "`bar`" anywhere that is directly
- under directory "`foo`".
+ "`foo`" anywhere. "`**/foo/bar`" matches file or directory "`bar`"
+ anywhere that is directly under directory "`foo`".
- A trailing "`/**`" matches everything inside. For example,
"`abc/**`" matches all files inside directory "abc", relative
diff --git a/line-range-format.adoc b/line-range-format.adoc
index 9b51e9f..3cc2a14 100644
--- a/line-range-format.adoc
+++ b/line-range-format.adoc
@@ -1,30 +1,30 @@
-'<start>' and '<end>' can take one of these forms:
+_<start>_ and _<end>_ can take one of these forms:
-- number
+- _<number>_
+
-If '<start>' or '<end>' is a number, it specifies an
+If _<start>_ or _<end>_ is a number, it specifies an
absolute line number (lines count from 1).
+
-- `/regex/`
+- `/<regex>/`
+
This form will use the first line matching the given
-POSIX regex. If '<start>' is a regex, it will search from the end of
+POSIX _<regex>_. If _<start>_ is a regex, it will search from the end of
the previous `-L` range, if any, otherwise from the start of file.
-If '<start>' is `^/regex/`, it will search from the start of file.
-If '<end>' is a regex, it will search
-starting at the line given by '<start>'.
+If _<start>_ is `^/<regex>/`, it will search from the start of file.
+If _<end>_ is a regex, it will search starting at the line given by
+_<start>_.
+
-- +offset or -offset
+- `+<offset>` or `-<offset>`
+
-This is only valid for '<end>' and will specify a number
-of lines before or after the line given by '<start>'.
+This is only valid for _<end>_ and will specify a number
+of lines before or after the line given by _<start>_.
+
-If `:<funcname>` is given in place of '<start>' and '<end>', it is a
+If `:<funcname>` is given in place of _<start>_ and _<end>_, it is a
regular expression that denotes the range from the first funcname line
-that matches '<funcname>', up to the next funcname line. `:<funcname>`
+that matches _<funcname>_, up to the next funcname line. `:<funcname>`
searches from the end of the previous `-L` range, if any, otherwise
from the start of file. `^:<funcname>` searches from the start of
file. The function names are determined in the same way as `git diff`
diff --git a/line-range-options.adoc b/line-range-options.adoc
index f275df3..c44ba05 100644
--- a/line-range-options.adoc
+++ b/line-range-options.adoc
@@ -1,12 +1,12 @@
--L<start>,<end>:<file>::
--L:<funcname>:<file>::
+`-L<start>,<end>:<file>`::
+`-L:<funcname>:<file>`::
- Trace the evolution of the line range given by '<start>,<end>',
- or by the function name regex '<funcname>', within the '<file>'. You may
+ Trace the evolution of the line range given by `<start>,<end>`,
+ or by the function name regex _<funcname>_, within the _<file>_. You may
not give any pathspec limiters. This is currently limited to
a walk starting from a single revision, i.e., you may only
give zero or one positive revision arguments, and
- '<start>' and '<end>' (or '<funcname>') must exist in the starting revision.
+ _<start>_ and _<end>_ (or _<funcname>_) must exist in the starting revision.
You can specify this option more than once. Implies `--patch`.
Patch output can be suppressed using `--no-patch`, but other diff formats
(namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`,
diff --git a/pretty-formats.adoc b/pretty-formats.adoc
index 07475de..9ed0417 100644
--- a/pretty-formats.adoc
+++ b/pretty-formats.adoc
@@ -2,11 +2,11 @@
--------------
If the commit is a merge, and if the pretty-format
-is not 'oneline', 'email' or 'raw', an additional line is
-inserted before the 'Author:' line. This line begins with
+is not `oneline`, `email` or `raw`, an additional line is
+inserted before the `Author:` line. This line begins with
"Merge: " and the hashes of ancestral commits are printed,
separated by spaces. Note that the listed commits may not
-necessarily be the list of the *direct* parent commits if you
+necessarily be the list of the 'direct' parent commits if you
have limited your view of history: for example, if you are
only interested in changes related to a certain directory or
file.
@@ -14,24 +14,24 @@
There are several built-in formats, and you can define
additional formats by setting a pretty.<name>
config option to either another format name, or a
-'format:' string, as described below (see
+`format:` string, as described below (see
linkgit:git-config[1]). Here are the details of the
built-in formats:
-* 'oneline'
+* `oneline`
<hash> <title-line>
+
This is designed to be as compact as possible.
-* 'short'
+* `short`
commit <hash>
Author: <author>
<title-line>
-* 'medium'
+* `medium`
commit <hash>
Author: <author>
@@ -41,7 +41,7 @@
<full-commit-message>
-* 'full'
+* `full`
commit <hash>
Author: <author>
@@ -51,7 +51,7 @@
<full-commit-message>
-* 'fuller'
+* `fuller`
commit <hash>
Author: <author>
@@ -63,18 +63,18 @@
<full-commit-message>
-* 'reference'
+* `reference`
<abbrev-hash> (<title-line>, <short-author-date>)
+
This format is used to refer to another commit in a commit message and
-is the same as `--pretty='format:%C(auto)%h (%s, %ad)'`. By default,
+is the same as ++--pretty=\'format:%C(auto)%h (%s, %ad)'++. By default,
the date is formatted with `--date=short` unless another `--date` option
is explicitly specified. As with any `format:` with format
placeholders, its output is not affected by other options like
`--decorate` and `--walk-reflogs`.
-* 'email'
+* `email`
From <hash> <date>
From: <author>
@@ -83,30 +83,30 @@
<full-commit-message>
-* 'mboxrd'
+* `mboxrd`
+
-Like 'email', but lines in the commit message starting with "From "
+Like `email`, but lines in the commit message starting with "From "
(preceded by zero or more ">") are quoted with ">" so they aren't
confused as starting a new commit.
-* 'raw'
+* `raw`
+
-The 'raw' format shows the entire commit exactly as
+The `raw` format shows the entire commit exactly as
stored in the commit object. Notably, the hashes are
-displayed in full, regardless of whether --abbrev or
---no-abbrev are used, and 'parents' information show the
+displayed in full, regardless of whether `--abbrev` or
+`--no-abbrev` are used, and 'parents' information show the
true parent commits, without taking grafts or history
simplification into account. Note that this format affects the way
commits are displayed, but not the way the diff is shown e.g. with
`git log --raw`. To get full object names in a raw diff format,
use `--no-abbrev`.
-* 'format:<format-string>'
+* `format:<format-string>`
+
-The 'format:<format-string>' format allows you to specify which information
+The `format:<format-string>` format allows you to specify which information
you want to show. It works a little bit like printf format,
-with the notable exception that you get a newline with '%n'
-instead of '\n'.
+with the notable exception that you get a newline with `%n`
+instead of `\n`.
+
E.g, 'format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"'
would show something like this:
@@ -120,158 +120,161 @@
The placeholders are:
- Placeholders that expand to a single literal character:
-'%n':: newline
-'%%':: a raw '%'
-'%x00':: '%x' followed by two hexadecimal digits is replaced with a
+++%n++:: newline
+++%%++:: a raw ++%++
+++%x00++:: ++%x++ followed by two hexadecimal digits is replaced with a
byte with the hexadecimal digits' value (we will call this
"literal formatting code" in the rest of this document).
- Placeholders that affect formatting of later placeholders:
-'%Cred':: switch color to red
-'%Cgreen':: switch color to green
-'%Cblue':: switch color to blue
-'%Creset':: reset color
-'%C(...)':: color specification, as described under Values in the
+++%Cred++:: switch color to red
+++%Cgreen++:: switch color to green
+++%Cblue++:: switch color to blue
+++%Creset++:: reset color
+++%C(++_<spec>_++)++:: color specification, as described under Values in the
"CONFIGURATION FILE" section of linkgit:git-config[1]. By
default, colors are shown only when enabled for log output
(by `color.diff`, `color.ui`, or `--color`, and respecting
the `auto` settings of the former if we are going to a
- terminal). `%C(auto,...)` is accepted as a historical
- synonym for the default (e.g., `%C(auto,red)`). Specifying
- `%C(always,...)` will show the colors even when color is
+ terminal). ++%C(auto,++_<spec>_++)++ is accepted as a historical
+ synonym for the default (e.g., ++%C(auto,red)++). Specifying
+ ++%C(always,++_<spec>_++)++ will show the colors even when color is
not otherwise enabled (though consider just using
- `--color=always` to enable color for the whole output,
+ `--color=always` to enable color for the whole output,
including this format and anything else git might color).
- `auto` alone (i.e. `%C(auto)`) will turn on auto coloring
+ `auto` alone (i.e. ++%C(auto)++) will turn on auto coloring
on the next placeholders until the color is switched
again.
-'%m':: left (`<`), right (`>`) or boundary (`-`) mark
-'%w([<w>[,<i1>[,<i2>]]])':: switch line wrapping, like the -w option of
+++%m++:: left (`<`), right (`>`) or boundary (`-`) mark
+++%w(++`[<w>[,<i1>[,<i2>]]]`++)++:: switch line wrapping, like the `-w` option of
linkgit:git-shortlog[1].
-'%<( <N> [,trunc|ltrunc|mtrunc])':: make the next placeholder take at
+++%<(++`<n>[,(trunc|ltrunc|mtrunc)]`++)++:: make the next placeholder take at
least N column widths, padding spaces on
the right if necessary. Optionally
- truncate (with ellipsis '..') at the left (ltrunc) `..ft`,
+ truncate (with ellipsis `..`) at the left (ltrunc) `..ft`,
the middle (mtrunc) `mi..le`, or the end
(trunc) `rig..`, if the output is longer than
- N columns.
+ _<n>_ columns.
Note 1: that truncating
- only works correctly with N >= 2.
- Note 2: spaces around the N and M (see below)
+ only works correctly with _<n>_ >= 2.
+ Note 2: spaces around the _<n>_ and _<m>_ (see below)
values are optional.
Note 3: Emojis and other wide characters
will take two display columns, which may
over-run column boundaries.
Note 4: decomposed character combining marks
may be misplaced at padding boundaries.
-'%<|( <M> )':: make the next placeholder take at least until Mth
+++%<|(++_<m>_ ++)++:: make the next placeholder take at least until _<m>_ th
display column, padding spaces on the right if necessary.
- Use negative M values for column positions measured
+ Use negative _<m>_ values for column positions measured
from the right hand edge of the terminal window.
-'%>( <N> )', '%>|( <M> )':: similar to '%<( <N> )', '%<|( <M> )' respectively,
+++%>(++_<n>_++)++::
+++%>|(++_<m>_++)++:: similar to ++%<(++_<n>_++)++, ++%<|(++_<m>_++)++ respectively,
but padding spaces on the left
-'%>>( <N> )', '%>>|( <M> )':: similar to '%>( <N> )', '%>|( <M> )'
+++%>>(++_<n>_++)++::
+++%>>|(++_<m>_++)++:: similar to ++%>(++_<n>_++)++, ++%>|(++_<m>_++)++
respectively, except that if the next
placeholder takes more spaces than given and
there are spaces on its left, use those
spaces
-'%><( <N> )', '%><|( <M> )':: similar to '%<( <N> )', '%<|( <M> )'
+++%><(++_<n>_++)++::
+++%><|(++_<m>_++)++:: similar to ++%<(++_<n>_++)++, ++%<|(++_<m>_++)++
respectively, but padding both sides
(i.e. the text is centered)
- Placeholders that expand to information extracted from the commit:
-'%H':: commit hash
-'%h':: abbreviated commit hash
-'%T':: tree hash
-'%t':: abbreviated tree hash
-'%P':: parent hashes
-'%p':: abbreviated parent hashes
-'%an':: author name
-'%aN':: author name (respecting .mailmap, see linkgit:git-shortlog[1]
++%H+:: commit hash
++%h+:: abbreviated commit hash
++%T+:: tree hash
++%t+:: abbreviated tree hash
++%P+:: parent hashes
++%p+:: abbreviated parent hashes
++%an+:: author name
++%aN+:: author name (respecting .mailmap, see linkgit:git-shortlog[1]
or linkgit:git-blame[1])
-'%ae':: author email
-'%aE':: author email (respecting .mailmap, see linkgit:git-shortlog[1]
++%ae+:: author email
++%aE+:: author email (respecting .mailmap, see linkgit:git-shortlog[1]
or linkgit:git-blame[1])
-'%al':: author email local-part (the part before the '@' sign)
-'%aL':: author local-part (see '%al') respecting .mailmap, see
++%al+:: author email local-part (the part before the `@` sign)
++%aL+:: author local-part (see +%al+) respecting .mailmap, see
linkgit:git-shortlog[1] or linkgit:git-blame[1])
-'%ad':: author date (format respects --date= option)
-'%aD':: author date, RFC2822 style
-'%ar':: author date, relative
-'%at':: author date, UNIX timestamp
-'%ai':: author date, ISO 8601-like format
-'%aI':: author date, strict ISO 8601 format
-'%as':: author date, short format (`YYYY-MM-DD`)
-'%ah':: author date, human style (like the `--date=human` option of
++%ad+:: author date (format respects --date= option)
++%aD+:: author date, RFC2822 style
++%ar+:: author date, relative
++%at+:: author date, UNIX timestamp
++%ai+:: author date, ISO 8601-like format
++%aI+:: author date, strict ISO 8601 format
++%as+:: author date, short format (`YYYY-MM-DD`)
++%ah+:: author date, human style (like the `--date=human` option of
linkgit:git-rev-list[1])
-'%cn':: committer name
-'%cN':: committer name (respecting .mailmap, see
++%cn+:: committer name
++%cN+:: committer name (respecting .mailmap, see
linkgit:git-shortlog[1] or linkgit:git-blame[1])
-'%ce':: committer email
-'%cE':: committer email (respecting .mailmap, see
++%ce+:: committer email
++%cE+:: committer email (respecting .mailmap, see
linkgit:git-shortlog[1] or linkgit:git-blame[1])
-'%cl':: committer email local-part (the part before the '@' sign)
-'%cL':: committer local-part (see '%cl') respecting .mailmap, see
++%cl+:: committer email local-part (the part before the `@` sign)
++%cL+:: committer local-part (see +%cl+) respecting .mailmap, see
linkgit:git-shortlog[1] or linkgit:git-blame[1])
-'%cd':: committer date (format respects --date= option)
-'%cD':: committer date, RFC2822 style
-'%cr':: committer date, relative
-'%ct':: committer date, UNIX timestamp
-'%ci':: committer date, ISO 8601-like format
-'%cI':: committer date, strict ISO 8601 format
-'%cs':: committer date, short format (`YYYY-MM-DD`)
-'%ch':: committer date, human style (like the `--date=human` option of
++%cd+:: committer date (format respects --date= option)
++%cD+:: committer date, RFC2822 style
++%cr+:: committer date, relative
++%ct+:: committer date, UNIX timestamp
++%ci+:: committer date, ISO 8601-like format
++%cI+:: committer date, strict ISO 8601 format
++%cs+:: committer date, short format (`YYYY-MM-DD`)
++%ch+:: committer date, human style (like the `--date=human` option of
linkgit:git-rev-list[1])
-'%d':: ref names, like the --decorate option of linkgit:git-log[1]
-'%D':: ref names without the " (", ")" wrapping.
-'%(decorate[:<options>])'::
++%d+:: ref names, like the --decorate option of linkgit:git-log[1]
++%D+:: ref names without the " (", ")" wrapping.
+++%(decorate++`[:<option>,...]`++)++::
ref names with custom decorations. The `decorate` string may be followed by a
colon and zero or more comma-separated options. Option values may contain
literal formatting codes. These must be used for commas (`%x2C`) and closing
parentheses (`%x29`), due to their role in the option syntax.
+
-** 'prefix=<value>': Shown before the list of ref names. Defaults to "{nbsp}`(`".
-** 'suffix=<value>': Shown after the list of ref names. Defaults to "`)`".
-** 'separator=<value>': Shown between ref names. Defaults to "`,`{nbsp}".
-** 'pointer=<value>': Shown between HEAD and the branch it points to, if any.
- Defaults to "{nbsp}`->`{nbsp}".
-** 'tag=<value>': Shown before tag names. Defaults to "`tag:`{nbsp}".
+** `prefix=<value>`: Shown before the list of ref names. Defaults to "{nbsp}+(+".
+** `suffix=<value>`: Shown after the list of ref names. Defaults to "+)+".
+** `separator=<value>`: Shown between ref names. Defaults to "+,+{nbsp}".
+** `pointer=<value>`: Shown between HEAD and the branch it points to, if any.
+ Defaults to "{nbsp}+->+{nbsp}".
+** `tag=<value>`: Shown before tag names. Defaults to "`tag:`{nbsp}".
+
For example, to produce decorations with no wrapping
or tag annotations, and spaces as separators:
+
-`%(decorate:prefix=,suffix=,tag=,separator= )`
+++%(decorate:prefix=,suffix=,tag=,separator= )++
-'%(describe[:<options>])'::
+++%(describe++`[:<option>,...]`++)++::
human-readable name, like linkgit:git-describe[1]; empty string for
undescribable commits. The `describe` string may be followed by a colon and
zero or more comma-separated options. Descriptions can be inconsistent when
tags are added or removed at the same time.
+
-** 'tags[=<bool-value>]': Instead of only considering annotated tags,
+** `tags[=<bool-value>]`: Instead of only considering annotated tags,
consider lightweight tags as well.
-** 'abbrev=<number>': Instead of using the default number of hexadecimal digits
+** `abbrev=<number>`: Instead of using the default number of hexadecimal digits
(which will vary according to the number of objects in the repository with a
default of 7) of the abbreviated object name, use <number> digits, or as many
digits as needed to form a unique object name.
-** 'match=<pattern>': Only consider tags matching the given
- `glob(7)` pattern, excluding the "refs/tags/" prefix.
-** 'exclude=<pattern>': Do not consider tags matching the given
- `glob(7)` pattern, excluding the "refs/tags/" prefix.
+** `match=<pattern>`: Only consider tags matching the given
+ `glob(7)` _<pattern>_, excluding the `refs/tags/` prefix.
+** `exclude=<pattern>`: Do not consider tags matching the given
+ `glob(7)` _<pattern>_, excluding the `refs/tags/` prefix.
-'%S':: ref name given on the command line by which the commit was reached
++%S+:: ref name given on the command line by which the commit was reached
(like `git log --source`), only works with `git log`
-'%e':: encoding
-'%s':: subject
-'%f':: sanitized subject line, suitable for a filename
-'%b':: body
-'%B':: raw body (unwrapped subject and body)
++%e+:: encoding
++%s+:: subject
++%f+:: sanitized subject line, suitable for a filename
++%b+:: body
++%B+:: raw body (unwrapped subject and body)
ifndef::git-rev-list[]
-'%N':: commit notes
++%N+:: commit notes
endif::git-rev-list[]
-'%GG':: raw verification message from GPG for a signed commit
-'%G?':: show "G" for a good (valid) signature,
++%GG+:: raw verification message from GPG for a signed commit
++%G?+:: show "G" for a good (valid) signature,
"B" for a bad signature,
"U" for a good signature with unknown validity,
"X" for a good signature that has expired,
@@ -279,86 +282,86 @@
"R" for a good signature made by a revoked key,
"E" if the signature cannot be checked (e.g. missing key)
and "N" for no signature
-'%GS':: show the name of the signer for a signed commit
-'%GK':: show the key used to sign a signed commit
-'%GF':: show the fingerprint of the key used to sign a signed commit
-'%GP':: show the fingerprint of the primary key whose subkey was used
++%GS+:: show the name of the signer for a signed commit
++%GK+:: show the key used to sign a signed commit
++%GF+:: show the fingerprint of the key used to sign a signed commit
++%GP+:: show the fingerprint of the primary key whose subkey was used
to sign a signed commit
-'%GT':: show the trust level for the key used to sign a signed commit
-'%gD':: reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2
++%GT+:: show the trust level for the key used to sign a signed commit
++%gD+:: reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2
minutes ago}`; the format follows the rules described for the
`-g` option. The portion before the `@` is the refname as
given on the command line (so `git log -g refs/heads/master`
would yield `refs/heads/master@{0}`).
-'%gd':: shortened reflog selector; same as `%gD`, but the refname
++%gd+:: shortened reflog selector; same as `%gD`, but the refname
portion is shortened for human readability (so
`refs/heads/master` becomes just `master`).
-'%gn':: reflog identity name
-'%gN':: reflog identity name (respecting .mailmap, see
++%gn+:: reflog identity name
++%gN+:: reflog identity name (respecting .mailmap, see
linkgit:git-shortlog[1] or linkgit:git-blame[1])
-'%ge':: reflog identity email
-'%gE':: reflog identity email (respecting .mailmap, see
++%ge+:: reflog identity email
++%gE+:: reflog identity email (respecting .mailmap, see
linkgit:git-shortlog[1] or linkgit:git-blame[1])
-'%gs':: reflog subject
-'%(trailers[:<options>])'::
++%gs+:: reflog subject
+++%(trailers++`[:<option>,...]`++)++::
display the trailers of the body as interpreted by
linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by
a colon and zero or more comma-separated options. If any option is provided
multiple times, the last occurrence wins.
+
-** 'key=<key>': only show trailers with specified <key>. Matching is done
+** `key=<key>`: only show trailers with specified <key>. Matching is done
case-insensitively and trailing colon is optional. If option is
given multiple times trailer lines matching any of the keys are
shown. This option automatically enables the `only` option so that
non-trailer lines in the trailer block are hidden. If that is not
desired it can be disabled with `only=false`. E.g.,
- `%(trailers:key=Reviewed-by)` shows trailer lines with key
+ +%(trailers:key=Reviewed-by)+ shows trailer lines with key
`Reviewed-by`.
-** 'only[=<bool>]': select whether non-trailer lines from the trailer
+** `only[=<bool>]`: select whether non-trailer lines from the trailer
block should be included.
-** 'separator=<sep>': specify the separator inserted between trailer
+** `separator=<sep>`: specify the separator inserted between trailer
lines. Defaults to a line feed character. The string <sep> may contain
the literal formatting codes described above. To use comma as
separator one must use `%x2C` as it would otherwise be parsed as
- next option. E.g., `%(trailers:key=Ticket,separator=%x2C )`
+ next option. E.g., +%(trailers:key=Ticket,separator=%x2C )+
shows all trailer lines whose key is "Ticket" separated by a comma
and a space.
-** 'unfold[=<bool>]': make it behave as if interpret-trailer's `--unfold`
+** `unfold[=<bool>]`: make it behave as if interpret-trailer's `--unfold`
option was given. E.g.,
- `%(trailers:only,unfold=true)` unfolds and shows all trailer lines.
-** 'keyonly[=<bool>]': only show the key part of the trailer.
-** 'valueonly[=<bool>]': only show the value part of the trailer.
-** 'key_value_separator=<sep>': specify the separator inserted between
+ +%(trailers:only,unfold=true)+ unfolds and shows all trailer lines.
+** `keyonly[=<bool>]`: only show the key part of the trailer.
+** `valueonly[=<bool>]`: only show the value part of the trailer.
+** `key_value_separator=<sep>`: specify the separator inserted between
the key and value of each trailer. Defaults to ": ". Otherwise it
- shares the same semantics as 'separator=<sep>' above.
+ shares the same semantics as `separator=<sep>` above.
NOTE: Some placeholders may depend on other options given to the
-revision traversal engine. For example, the `%g*` reflog options will
+revision traversal engine. For example, the +%g*+ reflog options will
insert an empty string unless we are traversing reflog entries (e.g., by
-`git log -g`). The `%d` and `%D` placeholders will use the "short"
+`git log -g`). The +%d+ and +%D+ placeholders will use the "short"
decoration format if `--decorate` was not already provided on the command
line.
The boolean options accept an optional value `[=<bool-value>]`. The
-values taken by `--type=bool` git-config[1], like `yes` and `off`,
+values taken by `--type=bool` linkgit:git-config[1], like `yes` and `off`,
are all accepted. Giving a boolean option without `=<value>` is
equivalent to giving it with `=true`.
-If you add a `+` (plus sign) after '%' of a placeholder, a line-feed
+If you add a `+` (plus sign) after +%+ of a placeholder, a line-feed
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.
-If you add a `-` (minus sign) after '%' of a placeholder, all consecutive
+If you add a `-` (minus sign) after +%+ of a placeholder, all consecutive
line-feeds immediately preceding the expansion are deleted if and only if the
placeholder expands to an empty string.
-If you add a ` ` (space) after '%' of a placeholder, a space
+If you add a `' '` (space) after +%+ of a placeholder, a space
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.
-* 'tformat:'
+* `tformat:`
+
-The 'tformat:' format works exactly like 'format:', except that it
+The `tformat:` format works exactly like `format:`, except that it
provides "terminator" semantics instead of "separator" semantics. In
other words, each commit has the message terminator character (usually a
newline) appended, rather than a separator placed between entries.
@@ -378,7 +381,7 @@
7134973
---------------------
+
-In addition, any unrecognized string that has a `%` in it is interpreted
+In addition, any unrecognized string that has a +%+ in it is interpreted
as if it has `tformat:` in front of it. For example, these two are
equivalent:
+
diff --git a/pretty-options.adoc b/pretty-options.adoc
index b36e96a..8aac51d 100644
--- a/pretty-options.adoc
+++ b/pretty-options.adoc
@@ -1,38 +1,38 @@
---pretty[=<format>]::
---format=<format>::
+`--pretty[=<format>]`::
+`--format=<format>`::
Pretty-print the contents of the commit logs in a given format,
- where '<format>' can be one of 'oneline', 'short', 'medium',
- 'full', 'fuller', 'reference', 'email', 'raw', 'format:<string>'
- and 'tformat:<string>'. When '<format>' is none of the above,
- and has '%placeholder' in it, it acts as if
- '--pretty=tformat:<format>' were given.
+ where '<format>' can be one of `oneline`, `short`, `medium`,
+ `full`, `fuller`, `reference`, `email`, `raw`, `format:<string>`
+ and `tformat:<string>`. When _<format>_ is none of the above,
+ and has `%<placeholder>` in it, it acts as if
+ `--pretty=tformat:<format>` were given.
+
See the "PRETTY FORMATS" section for some additional details for each
-format. When '=<format>' part is omitted, it defaults to 'medium'.
+format. When `=<format>` part is omitted, it defaults to `medium`.
+
-Note: you can specify the default pretty format in the repository
+NOTE: you can specify the default pretty format in the repository
configuration (see linkgit:git-config[1]).
---abbrev-commit::
+`--abbrev-commit`::
Instead of showing the full 40-byte hexadecimal commit object
name, show a prefix that names the object uniquely.
- "--abbrev=<n>" (which also modifies diff output, if it is displayed)
+ `--abbrev=<n>` (which also modifies diff output, if it is displayed)
option can be used to specify the minimum length of the prefix.
+
-This should make "--pretty=oneline" a whole lot more readable for
+This should make `--pretty=oneline` a whole lot more readable for
people using 80-column terminals.
---no-abbrev-commit::
+`--no-abbrev-commit`::
Show the full 40-byte hexadecimal commit object name. This negates
`--abbrev-commit`, either explicit or implied by other options such
- as "--oneline". It also overrides the `log.abbrevCommit` variable.
+ as `--oneline`. It also overrides the `log.abbrevCommit` variable.
---oneline::
- This is a shorthand for "--pretty=oneline --abbrev-commit"
+`--oneline`::
+ This is a shorthand for `--pretty=oneline --abbrev-commit`
used together.
---encoding=<encoding>::
+`--encoding=<encoding>`::
Commit objects record the character encoding used for the log message
in their encoding header; this option can be used to tell the
command to re-code the commit log message in the encoding
@@ -44,22 +44,22 @@
to convert the commit, we will quietly output the original
object verbatim.
---expand-tabs=<n>::
---expand-tabs::
---no-expand-tabs::
+`--expand-tabs=<n>`::
+`--expand-tabs`::
+`--no-expand-tabs`::
Perform a tab expansion (replace each tab with enough spaces
- to fill to the next display column that is a multiple of '<n>')
+ to fill to the next display column that is a multiple of _<n>_)
in the log message before showing it in the output.
`--expand-tabs` is a short-hand for `--expand-tabs=8`, and
`--no-expand-tabs` is a short-hand for `--expand-tabs=0`,
which disables tab expansion.
+
By default, tabs are expanded in pretty formats that indent the log
-message by 4 spaces (i.e. 'medium', which is the default, 'full',
-and 'fuller').
+message by 4 spaces (i.e. `medium`, which is the default, `full`,
+and `fuller`).
ifndef::git-rev-list[]
---notes[=<ref>]::
+`--notes[=<ref>]`::
Show the notes (see linkgit:git-notes[1]) that annotate the
commit, when showing the commit log message. This is the default
ifndef::with-breaking-changes[]
@@ -80,28 +80,29 @@
with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise
`refs/notes/` is prefixed to form the full name of the ref.
+
-Multiple --notes options can be combined to control which notes are
-being displayed. Examples: "--notes=foo" will show only notes from
-"refs/notes/foo"; "--notes=foo --notes" will show both notes from
+Multiple `--notes` options can be combined to control which notes are
+being displayed. Examples: "`--notes=foo`" will show only notes from
+`refs/notes/foo`; "`--notes=foo --notes`" will show both notes from
"refs/notes/foo" and from the default notes ref(s).
---no-notes::
+`--no-notes`::
Do not show notes. This negates the above `--notes` option, by
resetting the list of notes refs from which notes are shown.
Options are parsed in the order given on the command line, so e.g.
- "--notes --notes=foo --no-notes --notes=bar" will only show notes
- from "refs/notes/bar".
+ "`--notes --notes=foo --no-notes --notes=bar`" will only show notes
+ from `refs/notes/bar`.
---show-notes-by-default::
+`--show-notes-by-default`::
Show the default notes unless options for displaying specific
notes are given.
---show-notes[=<ref>]::
---[no-]standard-notes::
- These options are deprecated. Use the above --notes/--no-notes
+`--show-notes[=<ref>]`::
+`--standard-notes`::
+`--no-standard-notes`::
+ These options are deprecated. Use the above `--notes`/`--no-notes`
options instead.
endif::git-rev-list[]
---show-signature::
+`--show-signature`::
Check the validity of a signed commit object by passing the signature
to `gpg --verify` and show the output.
diff --git a/rev-list-description.adoc b/rev-list-description.adoc
index a9efa7f..82c680e 100644
--- a/rev-list-description.adoc
+++ b/rev-list-description.adoc
@@ -26,8 +26,8 @@
means "list all the commits which are reachable from 'foo' or 'bar', but
not from 'baz'".
-A special notation "'<commit1>'..'<commit2>'" can be used as a
-short-hand for "^'<commit1>' '<commit2>'". For example, either of
+A special notation "`<commit1>..<commit2>`" can be used as a
+short-hand for "`^<commit1> <commit2>`". For example, either of
the following may be used interchangeably:
ifdef::git-rev-list[]
@@ -43,7 +43,7 @@
-----------------------------------------------------------------------
endif::git-log[]
-Another special notation is "'<commit1>'...'<commit2>'" which is useful
+Another special notation is "`<commit1>...<commit2>`" which is useful
for merges. The resulting set of commits is the symmetric difference
between the two operands. The following two commands are equivalent:
diff --git a/rev-list-options.adoc b/rev-list-options.adoc
index ae87656..d9665d8 100644
--- a/rev-list-options.adoc
+++ b/rev-list-options.adoc
@@ -6,60 +6,60 @@
limiting may be applied.
Using more options generally further limits the output (e.g.
-`--since=<date1>` limits to commits newer than `<date1>`, and using it
+`--since=<date1>` limits to commits newer than _<date1>_, and using it
with `--grep=<pattern>` further limits to commits whose log message
-has a line that matches `<pattern>`), unless otherwise noted.
+has a line that matches _<pattern>_), unless otherwise noted.
Note that these are applied before commit
ordering and formatting options, such as `--reverse`.
--<number>::
--n <number>::
---max-count=<number>::
- Limit the number of commits to output.
+`-<number>`::
+`-n <number>`::
+`--max-count=<number>`::
+ Limit the output to _<number>_ commits.
---skip=<number>::
- Skip 'number' commits before starting to show the commit output.
+`--skip=<number>`::
+ Skip _<number>_ commits before starting to show the commit output.
---since=<date>::
---after=<date>::
- Show commits more recent than a specific date.
+`--since=<date>`::
+`--after=<date>`::
+ Show commits more recent than _<date>_.
---since-as-filter=<date>::
- Show all commits more recent than a specific date. This visits
+`--since-as-filter=<date>`::
+ Show all commits more recent than _<date>_. This visits
all commits in the range, rather than stopping at the first commit which
- is older than a specific date.
+ is older than _<date>_.
---until=<date>::
---before=<date>::
- Show commits older than a specific date.
+`--until=<date>`::
+`--before=<date>`::
+ Show commits older than _<date>_.
ifdef::git-rev-list[]
---max-age=<timestamp>::
---min-age=<timestamp>::
+`--max-age=<timestamp>`::
+`--min-age=<timestamp>`::
Limit the commits output to specified time range.
endif::git-rev-list[]
---author=<pattern>::
---committer=<pattern>::
+`--author=<pattern>`::
+`--committer=<pattern>`::
Limit the commits output to ones with author/committer
- header lines that match the specified pattern (regular
- expression). With more than one `--author=<pattern>`,
- commits whose author matches any of the given patterns are
+ header lines that match the _<pattern>_ regular
+ expression. With more than one `--author=<pattern>`,
+ commits whose author matches any of the _<pattern>_ are
chosen (similarly for multiple `--committer=<pattern>`).
---grep-reflog=<pattern>::
+`--grep-reflog=<pattern>`::
Limit the commits output to ones with reflog entries that
- match the specified pattern (regular expression). With
+ match the _<pattern>_ regular expression. With
more than one `--grep-reflog`, commits whose reflog message
matches any of the given patterns are chosen. It is an
error to use this option unless `--walk-reflogs` is in use.
---grep=<pattern>::
+`--grep=<pattern>`::
Limit the commits output to ones with a log message that
- matches the specified pattern (regular expression). With
+ matches the _<pattern>_ regular expression. With
more than one `--grep=<pattern>`, commits whose message
- matches any of the given patterns are chosen (but see
+ matches any of the _<pattern>_ are chosen (but see
`--all-match`).
ifndef::git-rev-list[]
+
@@ -67,35 +67,35 @@
matched as if it were part of the log message.
endif::git-rev-list[]
---all-match::
+`--all-match`::
Limit the commits output to ones that match all given `--grep`,
instead of ones that match at least one.
---invert-grep::
+`--invert-grep`::
Limit the commits output to ones with a log message that do not
- match the pattern specified with `--grep=<pattern>`.
+ match the _<pattern>_ specified with `--grep=<pattern>`.
--i::
---regexp-ignore-case::
+`-i`::
+`--regexp-ignore-case`::
Match the regular expression limiting patterns without regard to letter
case.
---basic-regexp::
+`--basic-regexp`::
Consider the limiting patterns to be basic regular expressions;
this is the default.
--E::
---extended-regexp::
+`-E`::
+`--extended-regexp`::
Consider the limiting patterns to be extended regular expressions
instead of the default basic regular expressions.
--F::
---fixed-strings::
+`-F`::
+`--fixed-strings`::
Consider the limiting patterns to be fixed strings (don't interpret
pattern as a regular expression).
--P::
---perl-regexp::
+`-P`::
+`--perl-regexp`::
Consider the limiting patterns to be Perl-compatible regular
expressions.
+
@@ -103,20 +103,20 @@
compile-time dependency. If Git wasn't compiled with support for them
providing this option will cause it to die.
---remove-empty::
+`--remove-empty`::
Stop when a given path disappears from the tree.
---merges::
+`--merges`::
Print only merge commits. This is exactly the same as `--min-parents=2`.
---no-merges::
+`--no-merges`::
Do not print commits with more than one parent. This is
exactly the same as `--max-parents=1`.
---min-parents=<number>::
---max-parents=<number>::
---no-min-parents::
---no-max-parents::
+`--min-parents=<number>`::
+`--max-parents=<number>`::
+`--no-min-parents`::
+`--no-max-parents`::
Show only commits which have at least (or at most) that many parent
commits. In particular, `--max-parents=1` is the same as `--no-merges`,
`--min-parents=2` is the same as `--merges`. `--max-parents=0`
@@ -126,7 +126,7 @@
again. Equivalent forms are `--min-parents=0` (any commit has 0 or more
parents) and `--max-parents=-1` (negative numbers denote no upper limit).
---first-parent::
+`--first-parent`::
When finding commits to include, follow only the first
parent commit upon seeing a merge commit. This option
can give a better overview when viewing the evolution of
@@ -141,14 +141,14 @@
to `first-parent`, see `--diff-merges=first-parent` for details.
endif::git-log[]
---exclude-first-parent-only::
+`--exclude-first-parent-only`::
When finding commits to exclude (with a '{caret}'), follow only
the first parent commit upon seeing a merge commit.
This can be used to find the set of changes in a topic branch
from the point where it diverged from the remote branch, given
that arbitrary merges can be valid topic branch changes.
---not::
+`--not`::
Reverses the meaning of the '{caret}' prefix (or lack thereof)
for all following revision specifiers, up to the next `--not`.
When used on the command line before --stdin, the revisions passed
@@ -156,37 +156,37 @@
via standard input, the revisions passed on the command line will
not be affected by it.
---all::
+`--all`::
Pretend as if all the refs in `refs/`, along with `HEAD`, are
- listed on the command line as '<commit>'.
+ listed on the command line as _<commit>_.
---branches[=<pattern>]::
+`--branches[=<pattern>]`::
Pretend as if all the refs in `refs/heads` are listed
- on the command line as '<commit>'. If '<pattern>' is given, limit
- branches to ones matching given shell glob. If pattern lacks '?',
+ on the command line as _<commit>_. If _<pattern>_ is given, limit
+ branches to ones matching given shell glob. If _<pattern>_ lacks '?',
'{asterisk}', or '[', '/{asterisk}' at the end is implied.
---tags[=<pattern>]::
+`--tags[=<pattern>]`::
Pretend as if all the refs in `refs/tags` are listed
- on the command line as '<commit>'. If '<pattern>' is given, limit
+ on the command line as _<commit>_. If _<pattern>_ is given, limit
tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}',
or '[', '/{asterisk}' at the end is implied.
---remotes[=<pattern>]::
+`--remotes[=<pattern>]`::
Pretend as if all the refs in `refs/remotes` are listed
- on the command line as '<commit>'. If '<pattern>' is given, limit
+ on the command line as _<commit>_. If _<pattern>_ is given, limit
remote-tracking branches to ones matching given shell glob.
If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied.
---glob=<glob-pattern>::
- Pretend as if all the refs matching shell glob '<glob-pattern>'
- are listed on the command line as '<commit>'. Leading 'refs/',
+`--glob=<glob-pattern>`::
+ Pretend as if all the refs matching shell glob _<glob-pattern>_
+ are listed on the command line as _<commit>_. Leading 'refs/',
is automatically prepended if missing. If pattern lacks '?', '{asterisk}',
or '[', '/{asterisk}' at the end is implied.
---exclude=<glob-pattern>::
+`--exclude=<glob-pattern>`::
- Do not include refs matching '<glob-pattern>' that the next `--all`,
+ Do not include refs matching _<glob-pattern>_ that the next `--all`,
`--branches`, `--tags`, `--remotes`, or `--glob` would otherwise
consider. Repetitions of this option accumulate exclusion patterns
up to the next `--all`, `--branches`, `--tags`, `--remotes`, or
@@ -199,7 +199,7 @@
or `--all`. If a trailing '/{asterisk}' is intended, it must be given
explicitly.
---exclude-hidden=[fetch|receive|uploadpack]::
+`--exclude-hidden=(fetch|receive|uploadpack)`::
Do not include refs that would be hidden by `git-fetch`,
`git-receive-pack` or `git-upload-pack` by consulting the appropriate
`fetch.hideRefs`, `receive.hideRefs` or `uploadpack.hideRefs`
@@ -207,11 +207,11 @@
linkgit:git-config[1]). This option affects the next pseudo-ref option
`--all` or `--glob` and is cleared after processing them.
---reflog::
+`--reflog`::
Pretend as if all objects mentioned by reflogs are listed on the
- command line as `<commit>`.
+ command line as _<commit>_.
---alternate-refs::
+`--alternate-refs`::
Pretend as if all objects mentioned as ref tips of alternate
repositories were listed on the command line. An alternate
repository is any repository whose object directory is specified
@@ -219,7 +219,7 @@
be modified by `core.alternateRefsCommand`, etc. See
linkgit:git-config[1].
---single-worktree::
+`--single-worktree`::
By default, all working trees will be examined by the
following options when there are more than one (see
linkgit:git-worktree[1]): `--all`, `--reflog` and
@@ -227,19 +227,19 @@
This option forces them to examine the current working tree
only.
---ignore-missing::
+`--ignore-missing`::
Upon seeing an invalid object name in the input, pretend as if
the bad input was not given.
ifndef::git-rev-list[]
---bisect::
+`--bisect`::
Pretend as if the bad bisection ref `refs/bisect/bad`
was listed and as if it was followed by `--not` and the good
bisection refs `refs/bisect/good-*` on the command
line.
endif::git-rev-list[]
---stdin::
+`--stdin`::
In addition to getting arguments from the command line, read
them from standard input as well. This accepts commits and
pseudo-options like `--all` and `--glob=`. When a `--` separator
@@ -249,15 +249,15 @@
influence any subsequent command line arguments.
ifdef::git-rev-list[]
---quiet::
+`--quiet`::
Don't print anything to standard output. This form
is primarily meant to allow the caller to
test the exit status to see if a range of objects is fully
connected (or not). It is faster than redirecting stdout
to `/dev/null` as the output does not have to be formatted.
---disk-usage::
---disk-usage=human::
+`--disk-usage`::
+`--disk-usage=human`::
Suppress normal output; instead, print the sum of the bytes used
for on-disk storage by the selected commits or objects. This is
equivalent to piping the output into `git cat-file
@@ -269,11 +269,11 @@
in human-readable string(e.g. 12.24 Kib, 3.50 Mib).
endif::git-rev-list[]
---cherry-mark::
+`--cherry-mark`::
Like `--cherry-pick` (see below) but mark equivalent commits
with `=` rather than omitting them, and inequivalent ones with `+`.
---cherry-pick::
+`--cherry-pick`::
Omit any commit that introduces the same change as
another commit on the ``other side'' when the set of
commits are limited with symmetric difference.
@@ -286,8 +286,8 @@
cherry-picked from branch A). With this option, such pairs of commits are
excluded from the output.
---left-only::
---right-only::
+`--left-only`::
+`--right-only`::
List only commits on the respective side of a symmetric difference,
i.e. only those which would be marked `<` resp. `>` by
`--left-right`.
@@ -298,20 +298,20 @@
More precisely, `--cherry-pick --right-only --no-merges` gives the exact
list.
---cherry::
+`--cherry`::
A synonym for `--right-only --cherry-mark --no-merges`; useful to
limit the output to the commits on our side and mark those that
have been applied to the other side of a forked history with
`git log --cherry upstream...mybranch`, similar to
`git cherry upstream mybranch`.
--g::
---walk-reflogs::
+`-g`::
+`--walk-reflogs`::
Instead of walking the commit ancestry chain, walk
reflog entries from the most recent one to older ones.
When this option is used you cannot specify commits to
- exclude (that is, '{caret}commit', 'commit1..commit2',
- and 'commit1\...commit2' notations cannot be used).
+ exclude (that is, `^<commit>`, `<commit1>..<commit2>`,
+ and `<commit1>...<commit2>` notations cannot be used).
+
With `--pretty` format other than `oneline` and `reference` (for obvious reasons),
this causes the output to have two extra lines of information
@@ -340,29 +340,29 @@
+
Under `--pretty=reference`, this information will not be shown at all.
---merge::
+`--merge`::
Show commits touching conflicted paths in the range `HEAD...<other>`,
where `<other>` is the first existing pseudoref in `MERGE_HEAD`,
`CHERRY_PICK_HEAD`, `REVERT_HEAD` or `REBASE_HEAD`. Only works
when the index has unmerged entries. This option can be used to show
relevant commits when resolving conflicts from a 3-way merge.
---boundary::
+`--boundary`::
Output excluded boundary commits. Boundary commits are
prefixed with `-`.
ifdef::git-rev-list[]
---use-bitmap-index::
+`--use-bitmap-index`::
Try to speed up the traversal using the pack bitmap index (if
one is available). Note that when traversing with `--objects`,
trees and blobs will not have their associated path printed.
---progress=<header>::
+`--progress=<header>`::
Show progress reports on stderr as objects are considered. The
`<header>` text will be printed with each progress update.
--z::
+`-z`::
Instead of being newline-delimited, each outputted object and its
accompanying metadata is delimited using NUL bytes. Output is printed
in the following form:
@@ -397,56 +397,56 @@
The following options select the commits to be shown:
-<paths>::
+`<paths>`::
Commits modifying the given <paths> are selected.
---simplify-by-decoration::
+`--simplify-by-decoration`::
Commits that are referred by some branch or tag are selected.
Note that extra commits can be shown to give a meaningful history.
The following options affect the way the simplification is performed:
-Default mode::
+`Default mode`::
Simplifies the history to the simplest history explaining the
final state of the tree. Simplest because it prunes some side
branches if the end result is the same (i.e. merging branches
with the same content)
---show-pulls::
+`--show-pulls`::
Include all commits from the default mode, but also any merge
commits that are not TREESAME to the first parent but are
TREESAME to a later parent. This mode is helpful for showing
the merge commits that "first introduced" a change to a branch.
---full-history::
+`--full-history`::
Same as the default mode, but does not prune some history.
---dense::
+`--dense`::
Only the selected commits are shown, plus some to have a
meaningful history.
---sparse::
+`--sparse`::
All commits in the simplified history are shown.
---simplify-merges::
+`--simplify-merges`::
Additional option to `--full-history` to remove some needless
merges from the resulting history, as there are no selected
commits contributing to this merge.
---ancestry-path[=<commit>]::
- When given a range of commits to display (e.g. 'commit1..commit2'
- or 'commit2 {caret}commit1'), and a commit <commit> in that range,
+`--ancestry-path[=<commit>]`::
+ When given a range of commits to display (e.g. `<commit1>..<commit2>`
+ or `<commit2> ^<commit1>`), and a commit _<commit>_ in that range,
only display commits in that range
- that are ancestors of <commit>, descendants of <commit>, or
- <commit> itself. If no commit is specified, use 'commit1' (the
- excluded part of the range) as <commit>. Can be passed multiple
+ that are ancestors of _<commit>_, descendants of _<commit>_, or
+ _<commit>_ itself. If no commit is specified, use _<commit1>_ (the
+ excluded part of the range) as _<commit>_. Can be passed multiple
times; if so, a commit is included if it is any of the commits
given or if it is an ancestor or descendant of one of them.
A more detailed explanation follows.
-Suppose you specified `foo` as the <paths>. We shall call commits
+Suppose you specified `foo` as the _<paths>_. We shall call commits
that modify `foo` !TREESAME, and the rest TREESAME. (In a diff
filtered for `foo`, they look different and equal, respectively.)
@@ -466,22 +466,22 @@
each merge. The commits are:
* `I` is the initial commit, in which `foo` exists with contents
- ``asdf'', and a file `quux` exists with contents ``quux''. Initial
+ `asdf`, and a file `quux` exists with contents `quux`. Initial
commits are compared to an empty tree, so `I` is !TREESAME.
-* In `A`, `foo` contains just ``foo''.
+* In `A`, `foo` contains just `foo`.
* `B` contains the same change as `A`. Its merge `M` is trivial and
hence TREESAME to all parents.
-* `C` does not change `foo`, but its merge `N` changes it to ``foobar'',
+* `C` does not change `foo`, but its merge `N` changes it to `foobar`,
so it is not TREESAME to any parent.
-* `D` sets `foo` to ``baz''. Its merge `O` combines the strings from
- `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent.
+* `D` sets `foo` to `baz`. Its merge `O` combines the strings from
+ `N` and `D` to `foobarbaz`; i.e., it is not TREESAME to any parent.
-* `E` changes `quux` to ``xyzzy'', and its merge `P` combines the
- strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`.
+* `E` changes `quux` to `xyzzy`, and its merge `P` combines the
+ strings to `quux xyzzy`. `P` is TREESAME to `O`, but not to `E`.
* `X` is an independent root commit that added a new file `side`, and `Y`
modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and
@@ -517,7 +517,7 @@
not affect the commits selected in default mode, so we have shown the
parent lines.
---full-history without parent rewriting::
+`--full-history` without parent rewriting::
This mode differs from the default in one point: always follow
all parents of a merge, even if it is TREESAME to one of them.
Even if more than one side of the merge has commits that are
@@ -536,7 +536,7 @@
about the parent/child relationships between the commits, so we show
them disconnected.
---full-history with parent rewriting::
+`--full-history` with parent rewriting::
Ordinary commits are only included if they are !TREESAME
(though this can be changed, see `--sparse` below).
+
@@ -560,18 +560,18 @@
In addition to the above settings, you can change whether TREESAME
affects inclusion:
---dense::
+`--dense`::
Commits that are walked are included if they are not TREESAME
to any parent.
---sparse::
+`--sparse`::
All commits that are walked are included.
+
Note that without `--full-history`, this still simplifies merges: if
one of the parents is TREESAME, we follow only that one, so the other
sides of the merge are never walked.
---simplify-merges::
+`--simplify-merges`::
First, build a history graph in the same way that
`--full-history` with parent rewriting does (see above).
+
@@ -618,9 +618,9 @@
There is another simplification mode available:
---ancestry-path[=<commit>]::
+`--ancestry-path[=<commit>]`::
Limit the displayed commits to those which are an ancestor of
- <commit>, or which are a descendant of <commit>, or are <commit>
+ _<commit>_, or which are a descendant of _<commit>_, or are _<commit>_
itself.
+
As an example use case, consider the following commit history:
@@ -636,15 +636,15 @@
A regular 'D..M' computes the set of commits that are ancestors of `M`,
but excludes the ones that are ancestors of `D`. This is useful to see
what happened to the history leading to `M` since `D`, in the sense
-that ``what does `M` have that did not exist in `D`''. The result in this
+that "what does `M` have that did not exist in `D`". The result in this
example would be all the commits, except `A` and `B` (and `D` itself,
of course).
+
When we want to find out what commits in `M` are contaminated with the
bug introduced by `D` and need fixing, however, we might want to view
-only the subset of 'D..M' that are actually descendants of `D`, i.e.
+only the subset of `D..M` that are actually descendants of `D`, i.e.
excluding `C` and `K`. This is exactly what the `--ancestry-path`
-option does. Applied to the 'D..M' range, it results in:
+option does. Applied to the `D..M` range, it results in:
+
-----------------------------------------------------------------------
E-------F
@@ -655,7 +655,7 @@
-----------------------------------------------------------------------
+
We can also use `--ancestry-path=D` instead of `--ancestry-path` which
-means the same thing when applied to the 'D..M' range but is just more
+means the same thing when applied to the `D..M` range but is just more
explicit.
+
If we instead are interested in a given topic within this range, and all
@@ -770,7 +770,7 @@
the change `X` came to override the changes from `A` and `B` in its
commit message.
---show-pulls::
+`--show-pulls`::
In addition to the commits shown in the default history, show
each merge commit that is not TREESAME to its first parent but
is TREESAME to a later parent.
@@ -819,7 +819,7 @@
Bisection Helpers
~~~~~~~~~~~~~~~~~
---bisect::
+`--bisect`::
Limit output to the one commit object which is roughly halfway between
included and excluded commits. Note that the bad bisection ref
`refs/bisect/bad` is added to the included commits (if it
@@ -843,7 +843,7 @@
generate and test new 'midpoint's until the commit chain is of length
one.
---bisect-vars::
+`--bisect-vars`::
This calculates the same as `--bisect`, except that refs in
`refs/bisect/` are not used, and except that this outputs
text ready to be eval'ed by the shell. These lines will assign the
@@ -855,7 +855,7 @@
`bisect_bad`, and the number of commits we are bisecting right now to
`bisect_all`.
---bisect-all::
+`--bisect-all`::
This outputs all the commit objects between the included and excluded
commits, ordered by their distance to the included and excluded
commits. Refs in `refs/bisect/` are not used. The farthest
@@ -878,15 +878,15 @@
By default, the commits are shown in reverse chronological order.
---date-order::
+`--date-order`::
Show no parents before all of its children are shown, but
otherwise show commits in the commit timestamp order.
---author-date-order::
+`--author-date-order`::
Show no parents before all of its children are shown, but
otherwise show commits in the author timestamp order.
---topo-order::
+`--topo-order`::
Show no parents before all of its children are shown, and
avoid showing commits on multiple lines of history
intermixed.
@@ -910,8 +910,8 @@
avoid showing the commits from two parallel development track mixed
together.
---reverse::
- Output the commits chosen to be shown (see Commit Limiting
+`--reverse`::
+ Output the commits chosen to be shown (see 'Commit Limiting'
section above) in reverse order. Cannot be combined with
`--walk-reflogs`.
endif::git-shortlog[]
@@ -923,39 +923,39 @@
These options are mostly targeted for packing of Git repositories.
ifdef::git-rev-list[]
---objects::
+`--objects`::
Print the object IDs of any object referenced by the listed
- commits. `--objects foo ^bar` thus means ``send me
+ commits. `--objects foo ^bar` thus means "send me
all object IDs which I need to download if I have the commit
- object _bar_ but not _foo_''. See also `--object-names` below.
+ object `bar` but not `foo`". See also `--object-names` below.
---in-commit-order::
+`--in-commit-order`::
Print tree and blob ids in order of the commits. The tree
and blob ids are printed after they are first referenced
by a commit.
---objects-edge::
+`--objects-edge`::
Similar to `--objects`, but also print the IDs of excluded
- commits prefixed with a ``-'' character. This is used by
+ commits prefixed with a "`-`" character. This is used by
linkgit:git-pack-objects[1] to build a ``thin'' pack, which records
objects in deltified form based on objects contained in these
excluded commits to reduce network traffic.
---objects-edge-aggressive::
+`--objects-edge-aggressive`::
Similar to `--objects-edge`, but it tries harder to find excluded
commits at the cost of increased time. This is used instead of
`--objects-edge` to build ``thin'' packs for shallow repositories.
---indexed-objects::
+`--indexed-objects`::
Pretend as if all trees and blobs used by the index are listed
on the command line. Note that you probably want to use
`--objects`, too.
---unpacked::
+`--unpacked`::
Only useful with `--objects`; print the object IDs that are not
in packs.
---object-names::
+`--object-names`::
Only useful with `--objects`; print the names of the object IDs
that are found. This is the default behavior. Note that the
"name" of each object is ambiguous, and mostly intended as a
@@ -964,52 +964,52 @@
to remove newlines; and if an object would appear multiple times
with different names, only one name is shown.
---no-object-names::
+`--no-object-names`::
Only useful with `--objects`; does not print the names of the object
IDs that are found. This inverts `--object-names`. This flag allows
the output to be more easily parsed by commands such as
linkgit:git-cat-file[1].
---filter=<filter-spec>::
+`--filter=<filter-spec>`::
Only useful with one of the `--objects*`; omits objects (usually
- blobs) from the list of printed objects. The '<filter-spec>'
+ blobs) from the list of printed objects. The _<filter-spec>_
may be one of the following:
+
-The form '--filter=blob:none' omits all blobs.
+The form `--filter=blob:none` omits all blobs.
+
-The form '--filter=blob:limit=<n>[kmg]' omits blobs of size at least n
-bytes or units. n may be zero. The suffixes k, m, and g can be used
-to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k'
+The form `--filter=blob:limit=<n>[kmg]` omits blobs of size at least _<n>_
+bytes or units. _<n>_ may be zero. The suffixes `k`, `m`, and `g` can be used
+to name units in KiB, MiB, or GiB. For example, `blob:limit=1k`
is the same as 'blob:limit=1024'.
+
-The form '--filter=object:type=(tag|commit|tree|blob)' omits all objects
+The form `--filter=object:type=(tag|commit|tree|blob)` omits all objects
which are not of the requested type.
+
-The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout
-specification contained in the blob (or blob-expression) '<blob-ish>'
+The form `--filter=sparse:oid=<blob-ish>` uses a sparse-checkout
+specification contained in the blob (or blob-expression) _<blob-ish>_
to omit blobs that would not be required for a sparse checkout on
the requested refs.
+
-The form '--filter=tree:<depth>' omits all blobs and trees whose depth
-from the root tree is >= <depth> (minimum depth if an object is located
-at multiple depths in the commits traversed). <depth>=0 will not include
+The form `--filter=tree:<depth>` omits all blobs and trees whose depth
+from the root tree is >= _<depth>_ (minimum depth if an object is located
+at multiple depths in the commits traversed). _<depth>_=0 will not include
any trees or blobs unless included explicitly in the command-line (or
-standard input when --stdin is used). <depth>=1 will include only the
+standard input when `--stdin` is used). _<depth>_=1 will include only the
tree and blobs which are referenced directly by a commit reachable from
-<commit> or an explicitly-given object. <depth>=2 is like <depth>=1
+_<commit>_ or an explicitly-given object. _<depth>_=2 is like <depth>=1
while also including trees and blobs one more level removed from an
explicitly-given commit or tree.
+
-Note that the form '--filter=sparse:path=<path>' that wants to read
+Note that the form `--filter=sparse:path=<path>` that wants to read
from an arbitrary path on the filesystem has been dropped for security
reasons.
+
-Multiple '--filter=' flags can be specified to combine filters. Only
+Multiple `--filter=` flags can be specified to combine filters. Only
objects which are accepted by every filter are included.
+
-The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be
+The form `--filter=combine:<filter1>+<filter2>+...<filterN>` can also be
used to combined several filters, but this is harder than just repeating
-the '--filter' flag and is usually not necessary. Filters are joined by
+the `--filter` flag and is usually not necessary. Filters are joined by
'{plus}' and individual filters are %-encoded (i.e. URL-encoded).
Besides the '{plus}' and '%' characters, the following characters are
reserved and also must be encoded: `~!@#$^&*()[]{}\;",<>?`+'`+
@@ -1017,52 +1017,52 @@
space and newline.
+
Other arbitrary characters can also be encoded. For instance,
-'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are
+`combine:tree:3+blob:none` and `combine:tree%3A3+blob%3Anone` are
equivalent.
---no-filter::
+`--no-filter`::
Turn off any previous `--filter=` argument.
---filter-provided-objects::
+`--filter-provided-objects`::
Filter the list of explicitly provided objects, which would otherwise
always be printed even if they did not match any of the filters. Only
useful with `--filter=`.
---filter-print-omitted::
+`--filter-print-omitted`::
Only useful with `--filter=`; prints a list of the objects omitted
by the filter. Object IDs are prefixed with a ``~'' character.
---missing=<missing-action>::
+`--missing=<missing-action>`::
A debug option to help with future "partial clone" development.
This option specifies how missing objects are handled.
+
-The form '--missing=error' requests that rev-list stop with an error if
+The form `--missing=error` requests that rev-list stop with an error if
a missing object is encountered. This is the default action.
+
-The form '--missing=allow-any' will allow object traversal to continue
+The form `--missing=allow-any` will allow object traversal to continue
if a missing object is encountered. Missing objects will silently be
omitted from the results.
+
-The form '--missing=allow-promisor' is like 'allow-any', but will only
+The form `--missing=allow-promisor` is like `allow-any`, but will only
allow object traversal to continue for EXPECTED promisor missing objects.
Unexpected missing objects will raise an error.
+
-The form '--missing=print' is like 'allow-any', but will also print a
+The form `--missing=print` is like `allow-any`, but will also print a
list of the missing objects. Object IDs are prefixed with a ``?'' character.
+
-The form '--missing=print-info' is like 'print', but will also print additional
+The form `--missing=print-info` is like `print`, but will also print additional
information about the missing object inferred from its containing object. The
information is all printed on the same line with the missing object ID in the
form: `?<oid> [<token>=<value>]...`. The `<token>=<value>` pairs containing
-additional information are separated from each other by a SP. The value is
-encoded in a token specific fashion, but SP or LF contained in value are always
+additional information are separated from each other by a _SP_. The value is
+encoded in a token specific fashion, but _SP_ or _LF_ contained in value are always
expected to be represented in such a way that the resulting encoded value does
not have either of these two problematic bytes. Each `<token>=<value>` may be
one of the following:
+
--
* The `path=<path>` shows the path of the missing object inferred from a
- containing object. A path containing SP or special characters is enclosed in
+ containing object. A path containing _SP_ or special characters is enclosed in
double-quotes in the C style as needed.
+
* The `type=<type>` shows the type of the missing object inferred from a
@@ -1073,7 +1073,7 @@
considered as missing too, and the traversal will ignore them. In case
we cannot get their Object ID though, an error will be raised.
---exclude-promisor-objects::
+`--exclude-promisor-objects`::
(For internal use only.) Prefilter object traversal at
promisor boundary. This is used with partial clone. This is
stronger than `--missing=allow-promisor` because it limits the
@@ -1081,7 +1081,7 @@
objects.
endif::git-rev-list[]
---no-walk[=(sorted|unsorted)]::
+`--no-walk[=(sorted|unsorted)]`::
Only show the given commits, but do not traverse their ancestors.
This has no effect if a range is specified. If the argument
`unsorted` is given, the commits are shown in the order they were
@@ -1090,7 +1090,7 @@
by commit time.
Cannot be combined with `--graph`.
---do-walk::
+`--do-walk`::
Overrides a previous `--no-walk`.
endif::git-shortlog[]
@@ -1111,10 +1111,10 @@
include::pretty-options.adoc[]
---relative-date::
+`--relative-date`::
Synonym for `--date=relative`.
---date=<format>::
+`--date=<format>`::
Only takes effect for dates shown in human-readable format, such
as when using `--pretty`. `log.date` config variable sets a default
value for the log command's `--date` option. By default, dates
@@ -1164,12 +1164,12 @@
1970). As with `--raw`, this is always in UTC and therefore `-local`
has no effect.
-`--date=format:...` feeds the format `...` to your system `strftime`,
-except for %s, %z, and %Z, which are handled internally.
+`--date=format:<format>` feeds the _<format>_ to your system `strftime`,
+except for `%s`, `%z`, and `%Z`, which are handled internally.
Use `--date=format:%c` to show the date in your system locale's
-preferred format. See the `strftime` manual for a complete list of
+preferred format. See the `strftime`(3) manual for a complete list of
format placeholders. When using `-local`, the correct syntax is
-`--date=format-local:...`.
+`--date=format-local:<format>`.
`--date=default` is the default format, and is based on ctime(3)
output. It shows a single line with three-letter day of the week,
@@ -1179,33 +1179,33 @@
--
ifdef::git-rev-list[]
---header::
+`--header`::
Print the contents of the commit in raw-format; each record is
separated with a NUL character.
---no-commit-header::
+`--no-commit-header`::
Suppress the header line containing "commit" and the object ID printed before
the specified format. This has no effect on the built-in formats; only custom
formats are affected.
---commit-header::
+`--commit-header`::
Overrides a previous `--no-commit-header`.
endif::git-rev-list[]
---parents::
+`--parents`::
Print also the parents of the commit (in the form "commit parent...").
Also enables parent rewriting, see 'History Simplification' above.
---children::
+`--children`::
Print also the children of the commit (in the form "commit child...").
Also enables parent rewriting, see 'History Simplification' above.
ifdef::git-rev-list[]
---timestamp::
+`--timestamp`::
Print the raw commit timestamp.
endif::git-rev-list[]
---left-right::
+`--left-right`::
Mark which side of a symmetric difference a commit is reachable from.
Commits from the left side are prefixed with `<` and those from
the right with `>`. If combined with `--boundary`, those
@@ -1234,7 +1234,7 @@
-xxxxxxx... 1st on a
-----------------------------------------------------------------------
---graph::
+`--graph`::
Draw a text-based graphical representation of the commit history
on the left hand side of the output. This may cause extra lines
to be printed in between commits, in order for the graph history
@@ -1246,15 +1246,15 @@
This implies the `--topo-order` option by default, but the
`--date-order` option may also be specified.
---show-linear-break[=<barrier>]::
- When --graph is not used, all history branches are flattened
+`--show-linear-break[=<barrier>]`::
+ When `--graph` is not used, all history branches are flattened
which can make it hard to see that the two consecutive commits
do not belong to a linear branch. This option puts a barrier
- in between them in that case. If `<barrier>` is specified, it
+ in between them in that case. If _<barrier>_ is specified, it
is the string that will be shown instead of the default one.
ifdef::git-rev-list[]
---count::
+`--count`::
Print a number stating how many commits would have been
listed, and suppress all other output. When used together
with `--left-right`, instead print the counts for left and
diff --git a/user-manual.html b/user-manual.html
index 78e82a7..e451b82 100644
--- a/user-manual.html
+++ b/user-manual.html
@@ -3467,9 +3467,8 @@
<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
A leading "<code class="literal">**</code>" followed by a slash means match in all
directories. For example, "<code class="literal">**/foo</code>" matches file or directory
-"<code class="literal">foo</code>" anywhere, the same as pattern "<code class="literal">foo</code>". "<code class="literal">**/foo/bar</code>"
-matches file or directory "<code class="literal">bar</code>" anywhere that is directly
-under directory "<code class="literal">foo</code>".
+"<code class="literal">foo</code>" anywhere. "<code class="literal">**/foo/bar</code>" matches file or directory "<code class="literal">bar</code>"
+anywhere that is directly under directory "<code class="literal">foo</code>".
</li><li class="listitem">
A trailing "<code class="literal">/**</code>" matches everything inside. For example,
"<code class="literal">abc/**</code>" matches all files inside directory "abc", relative
