summaryrefslogtreecommitdiffstats
path: root/git-log.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-27 11:05:05 -0700
committerJunio C Hamano <gitster@pobox.com>2016-06-27 11:05:05 -0700
commit042f2148898f2f73342c586887b252715dd8af8a (patch)
tree186d91f728919ef22f36d69ad4f555e3cb5277ff /git-log.txt
parentfedb1b428f68e8626c38f0aef57a8379e58f3241 (diff)
downloadgit-htmldocs-042f2148898f2f73342c586887b252715dd8af8a.tar.gz
Autogenerated HTML docs for v2.9.0-137-gcf4c2
Diffstat (limited to 'git-log.txt')
-rw-r--r--git-log.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-log.txt b/git-log.txt
index dec379b3e..4a6c47f84 100644
--- a/git-log.txt
+++ b/git-log.txt
@@ -203,7 +203,7 @@ mailmap.*::
notes.displayRef::
Which refs, in addition to the default set by `core.notesRef`
- or 'GIT_NOTES_REF', to read notes from when showing commit
+ or `GIT_NOTES_REF`, to read notes from when showing commit
messages with the `log` family of commands. See
linkgit:git-notes[1].
+
@@ -212,7 +212,7 @@ multiple times. A warning will be issued for refs that do not exist,
but a glob that does not match any refs is silently ignored.
+
This setting can be disabled by the `--no-notes` option,
-overridden by the 'GIT_NOTES_DISPLAY_REF' environment variable,
+overridden by the `GIT_NOTES_DISPLAY_REF` environment variable,
and overridden by the `--notes=<ref>` option.
GIT