summaryrefslogtreecommitdiff
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-02 22:58:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-02 22:58:50 (GMT)
commit23f536cf6236bf2a29026fea52c6bf7624b6485d (patch)
tree2738ba07faa16941f0d0d5dbc19ec39821920754 /Documentation/git-log.txt
parenta75c3523d35144934e97f2660401e05b36ef8083 (diff)
parent3925b575687f64d49bd777ba6f64557a56b838b6 (diff)
downloadgit-23f536cf6236bf2a29026fea52c6bf7624b6485d.zip
git-23f536cf6236bf2a29026fea52c6bf7624b6485d.tar.gz
git-23f536cf6236bf2a29026fea52c6bf7624b6485d.tar.bz2
Merge branch 'jk/notes-ui-updates'
* jk/notes-ui-updates: contrib/completion: --notes, --no-notes log/pretty-options: Document --[no-]notes and deprecate old notes options revision.c: make --no-notes reset --notes list revision.c: support --notes command-line option notes: refactor display notes default handling notes: refactor display notes extra refs field revision.c: refactor notes ref expansion notes: make expand_notes_ref globally accessible
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 2c84028..de5c0d3 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
---