diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-09-07 08:27:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-07 16:46:06 (GMT) |
| commit | 5bd277e2e2059840cda807de511f02c291e039c9 (patch) | |
| tree | 5f145eb1f91db92df2b2cb101f12351ae4800edf /Documentation/git-log.txt | |
| parent | 416fed246ffaed4cafb9c35e38d1402704a377be (diff) | |
| download | git-5bd277e2e2059840cda807de511f02c291e039c9.zip git-5bd277e2e2059840cda807de511f02c291e039c9.tar.gz git-5bd277e2e2059840cda807de511f02c291e039c9.tar.bz2 | |
notes docs: de-duplicate and combine configuration sections
Combine the various "notes" configuration sections spread across
Documentation/config/notes.txt and Documentation/git-notes.txt to live
in the former, and to be included in the latter.
We'll now forward link from "git notes" to the "CONFIGURATION" section
below, rather than to "git-config(1)" when discussing configuration
variables that are (also) discussed in that section.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-log.txt')
| -rw-r--r-- | Documentation/git-log.txt | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 20e87ce..ed802bb 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -227,19 +227,9 @@ log.showSignature:: 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/notes.txt[] GIT --- |