Merge branch 'jn/doc-help-translaing-pretty-options'

Documentation for "git log --pretty" options has been updated
to make it easier to translate.

* jn/doc-help-translaing-pretty-options:
  doc: do not break sentences into "lego" pieces
This commit is contained in:
Junio C Hamano 2025-10-14 12:56:08 -07:00
commit 11f5a2264e

View File

@ -61,15 +61,16 @@ and `fuller`).
ifndef::git-rev-list[]
`--notes[=<ref>]`::
Show the notes (see linkgit:git-notes[1]) that annotate the
commit, when showing the commit log message. This is the default
commit, when showing the commit log message.
ifndef::with-breaking-changes[]
for `git log`, `git show` and `git whatchanged` commands when
This is the default for `git log`, `git show` and `git whatchanged`
commands when there is no `--pretty`, `--format`, or `--oneline` option given
on the command line.
endif::with-breaking-changes[]
ifdef::with-breaking-changes[]
for `git log` and `git show` commands when
This is the default for `git log` and `git show` commands when there is no
`--pretty`, `--format`, or `--oneline` option given on the command line.
endif::with-breaking-changes[]
there is no `--pretty`, `--format`, or `--oneline` option given
on the command line.
+
By default, the notes shown are from the notes refs listed in the
`core.notesRef` and `notes.displayRef` variables (or corresponding