From ab18b2c0df93b518ff9591d69e5e607fee718814 Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Wed, 30 Mar 2011 02:57:19 +0200 Subject: log/pretty-options: Document --[no-]notes and deprecate old notes options Document the behavior or the new --notes, --notes= and --no-notes options, and list --show-notes[=] and --[no-]standard-notes options as deprecated. Signed-off-by: Johan Herland Acked-by: Jeff King Signed-off-by: Junio C Hamano --- Documentation/git-log.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/git-log.txt') 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=` option. GIT --- -- cgit v1.2.3