diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 12:56:39 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 12:56:40 -0700 |
commit | 7a54d740451c1438b4db009bf2ebe1669c280ef8 (patch) | |
tree | f7e62497ee2ee95308c682377282dce0ab60a0b3 /Documentation/git-log.txt | |
parent | dd407f1c7c7cce148d7313537494d0bc049ccb0e (diff) | |
parent | 9274dea3d95365c1ed0cd5ef46a9b677ae5c478f (diff) | |
download | git-7a54d740451c1438b4db009bf2ebe1669c280ef8.tar.gz |
Merge branch 'ab/dedup-config-and-command-docs'
Share the text used to explain configuration variables used by "git
<subcmd>" in "git help <subcmd>" with the text from "git help config".
* ab/dedup-config-and-command-docs:
docs: add CONFIGURATION sections that fuzzy map to built-ins
docs: add CONFIGURATION sections that map to a built-in
log docs: de-duplicate configuration sections
difftool docs: de-duplicate configuration sections
notes docs: de-duplicate and combine configuration sections
apply docs: de-duplicate configuration sections
send-email docs: de-duplicate configuration sections
grep docs: de-duplicate configuration sections
docs: add and use include template for config/* includes
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r-- | Documentation/git-log.txt | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index b1285aee3c..2a66cf8880 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -209,47 +209,11 @@ i18n.logOutputEncoding:: Defaults to the value of `i18n.commitEncoding` if set, and 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`. -+ -If the format is set to "auto:foo" and the pager is in use, format -"foo" will be the used for the date format. Otherwise "default" will -be used. - -log.follow:: - If `true`, `git log` will act as if the `--follow` option was used when - a single <path> is given. This has the same limitations as `--follow`, - i.e. it cannot be used to follow multiple files and does not work well - on non-linear history. - -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`. - -log.showSignature:: - If `true`, `git log` and related commands will act as if the - `--show-signature` option was passed to them. - -mailmap.*:: - 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-notes` option, -overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, -and overridden by the `--notes=<ref>` option. +include::includes/cmd-config-section-rest.txt[] + +include::config/log.txt[] + +include::config/notes.txt[] GIT --- |