Skip to content

Commit 00c8053

Browse files
avargitster
authored andcommitted
log docs: de-duplicate configuration sections
Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Reviewed-by: Matheus Tavares <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2a9dfdf commit 00c8053

File tree

2 files changed

+6
-28
lines changed

2 files changed

+6
-28
lines changed

Documentation/config/log.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ log.date::
77
Set the default date-time mode for the 'log' command.
88
Setting a value for log.date is similar to using 'git log''s
99
`--date` option. See linkgit:git-log[1] for details.
10+
+
11+
If the format is set to "auto:foo" and the pager is in use, format
12+
"foo" will be the used for the date format. Otherwise "default" will
13+
be used.
1014

1115
log.decorate::
1216
Print out the ref names of any commits that are shown by the log

Documentation/git-log.txt

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -199,36 +199,10 @@ i18n.logOutputEncoding::
199199
Defaults to the value of `i18n.commitEncoding` if set, and UTF-8
200200
otherwise.
201201

202-
log.date::
203-
Default format for human-readable dates. (Compare the
204-
`--date` option.) Defaults to "default", which means to write
205-
dates like `Sat May 8 19:35:34 2010 -0500`.
206-
+
207-
If the format is set to "auto:foo" and the pager is in use, format
208-
"foo" will be the used for the date format. Otherwise "default" will
209-
be used.
210-
211-
log.follow::
212-
If `true`, `git log` will act as if the `--follow` option was used when
213-
a single <path> is given. This has the same limitations as `--follow`,
214-
i.e. it cannot be used to follow multiple files and does not work well
215-
on non-linear history.
216-
217-
log.showRoot::
218-
If `false`, `git log` and related commands will not treat the
219-
initial commit as a big creation event. Any root commits in
220-
`git log -p` output would be shown without a diff attached.
221-
The default is `true`.
222-
223-
log.showSignature::
224-
If `true`, `git log` and related commands will act as if the
225-
`--show-signature` option was passed to them.
226-
227-
mailmap.*::
228-
See linkgit:git-shortlog[1].
229-
230202
include::includes/cmd-config-section-rest.txt[]
231203

204+
include::config/log.txt[]
205+
232206
include::config/notes.txt[]
233207

234208
GIT

0 commit comments

Comments
 (0)