summaryrefslogtreecommitdiff
path: root/Documentation/pretty-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-31 15:38:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-31 15:38:55 -0700
commit0bb71fb36d60902a2efffd7e6df1cc821884e67c (patch)
treea2d27d511fa3d4b085ce46a8414212de35f4064b /Documentation/pretty-options.txt
parentMerge branch 'hv/submodule-config' (diff)
parentrev-list: make it obvious that we do not support notes (diff)
downloadtgif-0bb71fb36d60902a2efffd7e6df1cc821884e67c.tar.xz
Merge branch 'jk/rev-list-has-no-notes'
"git rev-list" does not take "--notes" option, but did not complain when one is given. * jk/rev-list-has-no-notes: rev-list: make it obvious that we do not support notes
Diffstat (limited to 'Documentation/pretty-options.txt')
-rw-r--r--Documentation/pretty-options.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index 642af6e426..8d6c5cec4c 100644
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -42,6 +42,7 @@ people using 80-column terminals.
verbatim; this means that invalid sequences in the original
commit may be copied to the output.
+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
@@ -73,6 +74,7 @@ being displayed. Examples: "--notes=foo" will show only notes from
--[no-]standard-notes::
These options are deprecated. Use the above --notes/--no-notes
options instead.
+endif::git-rev-list[]
--show-signature::
Check the validity of a signed commit object by passing the signature