log docs: de-duplicate configuration sections

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>

diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt
index 456eb07800cb1eef63e9d26f96a1ed35b6e65116..f2ea11c0cfc8f0df4ae39058ba0b64487cc59351 100644 (file)
--- a/Documentation/config/log.txt
+++ b/Documentation/config/log.txt
@@ -7,6 +7,10 @@ log.date::
        Set the default date-time mode for the 'log' command.
        Setting a value for log.date is similar to using 'git log''s
        `--date` option.  See linkgit:git-log[1] for details.
++
+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.decorate::
        Print out the ref names of any commits that are shown by the log

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index ed802bb8e12956c9ef4ab6db662303f2db95a39d..1e6b9184f756bba68f8e56774047d6977350627a 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -199,36 +199,10 @@ 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].
-
 include::includes/cmd-config-section-rest.txt[]
 
+include::config/log.txt[]
+
 include::config/notes.txt[]
 
 GIT