aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-log.adoc
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-08-25 14:22:01 -0700
committerJunio C Hamano <gitster@pobox.com>2025-08-25 14:22:02 -0700
commit0d8f4ccfe3b13bb5eb95f030dc5fe76efb255397 (patch)
treed7c7205b2ae9788e006996be6f8074978f215507 /Documentation/git-log.adoc
parent109c3df14ccf372c2438a470bdfb566265399f0a (diff)
parent84f3d6e11e085a52e561a509f2433208f22c6d3b (diff)
downloadgit-0d8f4ccfe3b13bb5eb95f030dc5fe76efb255397.tar.xz
Merge branch 'ja/doc-lint-sections-and-synopsis'
Doc lint updates to encourage the newer and easier-to-use `synopsis` format, with fixes to a handful of existing uses. * ja/doc-lint-sections-and-synopsis: doc lint: check that synopsis manpages have synopsis inlines doc:git-for-each-ref: fix styling and typos doc: check for absence of the form --[no-]parameter doc: check for absence of multiple terms in each entry of desc list doc: check well-formedness of delimited sections doc: test linkgit macros for well-formedness
Diffstat (limited to 'Documentation/git-log.adoc')
-rw-r--r--Documentation/git-log.adoc6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-log.adoc b/Documentation/git-log.adoc
index b6f3d92c43..e304739c5e 100644
--- a/Documentation/git-log.adoc
+++ b/Documentation/git-log.adoc
@@ -73,8 +73,10 @@ used as decoration if they match `HEAD`, `refs/heads/`, `refs/remotes/`,
Print out the ref name given on the command line by which each
commit was reached.
-`--[no-]mailmap`::
-`--[no-]use-mailmap`::
+`--mailmap`::
+`--no-mailmap`::
+`--use-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].