summaryrefslogtreecommitdiff
path: root/Documentation/pretty-options.adoc
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/pretty-options.adoc')
-rw-r--r--Documentation/pretty-options.adoc11
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