diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2025-10-05 21:12:04 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-05 16:10:53 -0700 |
| commit | 1d8c62a749bded1568fc3d1dab9313ba3003baa2 (patch) | |
| tree | 4518a8d7ef142b7a75e2b787921bef0d240a7dd7 /Documentation/pretty-options.adoc | |
| parent | Merge branch 'master' of https://github.com/j6t/gitk (diff) | |
| download | git-1d8c62a749bded1568fc3d1dab9313ba3003baa2.tar.gz git-1d8c62a749bded1568fc3d1dab9313ba3003baa2.zip | |
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 <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | Documentation/pretty-options.adoc | 11 |
1 files changed, 6 insertions, 5 deletions
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[=<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 |