summaryrefslogtreecommitdiffstats
path: root/pretty-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-03-25 00:38:53 +0000
committerJunio C Hamano <junio@kernel.org>2010-03-25 00:38:53 +0000
commit3166736468c0b21727d059d09468111c5a3163c4 (patch)
treef94473e9050b0b159edbdec0a0619f4d8d57c11d /pretty-options.txt
parent9ccf664de57a05c6417f1fe46f6c6b55322f218c (diff)
downloadgit-htmldocs-3166736468c0b21727d059d09468111c5a3163c4.tar.gz
Autogenerated HTML docs for v1.7.0.3-291-g5e4f
Diffstat (limited to 'pretty-options.txt')
-rw-r--r--pretty-options.txt11
1 files changed, 10 insertions, 1 deletions
diff --git a/pretty-options.txt b/pretty-options.txt
index aa96caeab..af6d2b995 100644
--- a/pretty-options.txt
+++ b/pretty-options.txt
@@ -30,9 +30,18 @@ people using 80-column terminals.
defaults to UTF-8.
--no-notes::
---show-notes::
+--show-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
there is no `--pretty`, `--format` nor `--oneline` option is
given on the command line.
++
+With an optional argument, add this ref to the list of notes. The ref
+is taken to be in `refs/notes/` if it is not qualified.
+
+--[no-]standard-notes::
+ Enable or disable populating the notes ref list from the
+ 'core.notesRef' and 'notes.displayRef' variables (or
+ corresponding environment overrides). Enabled by default.
+ See linkgit:git-config[1].