summaryrefslogtreecommitdiffstats
path: root/pretty-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-05 14:22:00 -0800
committerJunio C Hamano <gitster@pobox.com>2019-12-05 14:22:00 -0800
commitb3f862c5e7e19d0ae8abc32492356ff7d1578110 (patch)
tree95b41daba023b1705d5ec5b8d4db399c8cbc3f9d /pretty-options.txt
parent8ef91f31f6606a0370b18943c3b0f089e04873f9 (diff)
downloadgit-htmldocs-b3f862c5e7e19d0ae8abc32492356ff7d1578110.tar.gz
Autogenerated HTML docs for v2.24.0-390-g083378
Diffstat (limited to 'pretty-options.txt')
-rw-r--r--pretty-options.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/pretty-options.txt b/pretty-options.txt
index e44fc8f73..6893a4a7b 100644
--- a/pretty-options.txt
+++ b/pretty-options.txt
@@ -57,7 +57,7 @@ message by 4 spaces (i.e. 'medium', which is the default, 'full',
and 'fuller').
ifndef::git-rev-list[]
---notes[=<treeish>]::
+--notes[=<ref>]::
Show the notes (see linkgit:git-notes[1]) that annotate the
commit, when showing the commit log message. This is the default
for `git log`, `git show` and `git whatchanged` commands when
@@ -68,8 +68,8 @@ By default, the notes shown are from the notes refs listed in the
`core.notesRef` and `notes.displayRef` variables (or corresponding
environment overrides). See linkgit:git-config[1] for more details.
+
-With an optional '<treeish>' argument, use the treeish to find the notes
-to display. The treeish can specify the full refname when it begins
+With an optional '<ref>' argument, use the ref to find the notes
+to display. The ref can specify the full refname when it begins
with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise
`refs/notes/` is prefixed to form a full name of the ref.
+
@@ -85,7 +85,7 @@ being displayed. Examples: "--notes=foo" will show only notes from
"--notes --notes=foo --no-notes --notes=bar" will only show notes
from "refs/notes/bar".
---show-notes[=<treeish>]::
+--show-notes[=<ref>]::
--[no-]standard-notes::
These options are deprecated. Use the above --notes/--no-notes
options instead.