log/pretty-options: Document --[no-]notes and deprecate old notes options

[git.git] / Documentation / git-log.txt

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 2c84028838d566d424082efc71516f565b0ebbd2..de5c0d37a5c1c8c948aa01e276c3e198eb617be6 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -178,9 +178,9 @@ May be an unabbreviated ref name or a glob and may be specified
 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-standard-notes` option,
+This setting can be disabled by the `--no-notes` option,
 overridden by the 'GIT_NOTES_DISPLAY_REF' environment variable,
-and supplemented by the `--show-notes` option.
+and overridden by the `--notes=<ref>` option.
 
 GIT
 ---