From: Jean-Noël Avila Date: Sun, 5 Oct 2025 21:12:04 +0000 (+0000) Subject: doc: do not break sentences into "lego" pieces X-Git-Tag: v2.52.0-rc0~61^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d8c62a749bded1568fc3d1dab9313ba3003baa2;p=thirdparty%2Fgit.git doc: do not break sentences into "lego" pieces The sentence needs to be whole to be properly translated. Signed-off-by: Jean-Noël Avila Signed-off-by: Junio C Hamano --- diff --git a/Documentation/pretty-options.adoc b/Documentation/pretty-options.adoc index 8aac51dbe7..658e462b25 100644 --- a/Documentation/pretty-options.adoc +++ b/Documentation/pretty-options.adoc @@ -61,15 +61,16 @@ and `fuller`). ifndef::git-rev-list[] `--notes[=]`:: 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