summaryrefslogtreecommitdiffstats
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorJohan Herland <johan@herland.net>2011-03-30 02:57:19 +0200
committerJunio C Hamano <gitster@pobox.com>2011-03-30 20:36:51 +0200
commitab18b2c0df93b518ff9591d69e5e607fee718814 (patch)
tree87e860d4ce24e785f49d21585f4a6fa315686810 /Documentation/git-log.txt
parentrevision.c: make --no-notes reset --notes list (diff)
downloadgit-ab18b2c0df93b518ff9591d69e5e607fee718814.tar.xz
git-ab18b2c0df93b518ff9591d69e5e607fee718814.zip
log/pretty-options: Document --[no-]notes and deprecate old notes options
Document the behavior or the new --notes, --notes=<ref> and --no-notes options, and list --show-notes[=<ref>] and --[no-]standard-notes options as deprecated. Signed-off-by: Johan Herland <johan@herland.net> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r--Documentation/git-log.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 2c84028838..de5c0d37a5 100644
--- 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
---