summaryrefslogtreecommitdiff
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-13 11:21:06 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-13 11:21:06 -0700
commit95e42a64a9e713bcc3c4590fb933c93d37342322 (patch)
tree4bf5b47c3b098bf4848313350888bb24d3ab93e0 /Documentation/git-log.txt
parentce987457ca3db0c78d5e720f753adf210fd3dd65 (diff)
parent1a3eb9a0325fc1d1d168b517210b7760d31d3022 (diff)
downloadgit-95e42a64a9e713bcc3c4590fb933c93d37342322.tar.gz
Merge branch 'jn/notes-doc'
* jn/notes-doc: Documentation/notes: nitpicks Documentation/notes: clean up description of rewriting configuration Documentation/notes: simplify treatment of default display refs Documentation/log: add a CONFIGURATION section Documentation/notes: simplify treatment of default notes ref Documentation/notes: add configuration section Documentation/notes: describe content of notes blobs Documentation/notes: document format of notes trees
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r--Documentation/git-log.txt42
1 files changed, 42 insertions, 0 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index a2d55f9745..0e6ff31823 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -133,6 +133,48 @@ Discussion
include::i18n.txt[]
+Configuration
+-------------
+
+See linkgit:git-config[1] for core variables and linkgit:git-diff[1]
+for settings related to diff generation.
+
+format.pretty::
+ Default for the `--format` option. (See "PRETTY FORMATS" above.)
+ Defaults to "medium".
+
+i18n.logOutputEncoding::
+ Encoding to use when displaying logs. (See "Discussion", above.)
+ Defaults to the value of `i18n.commitEncoding` if set, UTF-8
+ otherwise.
+
+log.date::
+ Default format for human-readable dates. (Compare the
+ `--date` option.) Defaults to "default", which means to write
+ dates like `Sat May 8 19:35:34 2010 -0500`.
+
+log.showroot::
+ If `false`, 'git log' and related commands will not treat the
+ initial commit as a big creation event. Any root commits in
+ `git log -p` output would be shown without a diff attached.
+ The default is `true`.
+
+mailmap.file::
+ See linkgit:git-shortlog[1].
+
+notes.displayRef::
+ Which refs, in addition to the default set by `core.notesRef`
+ or 'GIT_NOTES_REF', to read notes from when showing commit
+ messages with the 'log' family of commands. See
+ linkgit:git-notes[1].
++
+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,
+overridden by the 'GIT_NOTES_DISPLAY_REF' environment variable,
+and supplemented by the `--show-notes` option.
Author
------