diff options
Diffstat (limited to 'man1/git-log.1')
| -rw-r--r-- | man1/git-log.1 | 209 |
1 files changed, 178 insertions, 31 deletions
diff --git a/man1/git-log.1 b/man1/git-log.1 index c9196f050..0f2143438 100644 --- a/man1/git-log.1 +++ b/man1/git-log.1 @@ -2,12 +2,12 @@ .\" Title: git-log .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-LOG" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-LOG" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -4449,17 +4449,83 @@ above\&.) Defaults to the value of \fBi18n\&.commitEncoding\fR if set, and UTF\-8 otherwise\&. .RE +.sp +Everything above this line in this section isn\(cqt included from the \fBgit-config\fR(1) documentation\&. The content that follows is the same as what\(cqs found there: +.PP +log\&.abbrevCommit +.RS 4 +If true, makes +\fBgit-log\fR(1), +\fBgit-show\fR(1), and +\fBgit-whatchanged\fR(1) +assume +\fB\-\-abbrev\-commit\fR\&. You may override this option with +\fB\-\-no\-abbrev\-commit\fR\&. +.RE .PP log\&.date .RS 4 -Default format for human\-readable dates\&. (Compare the +Set the default date\-time mode for the +\fIlog\fR +command\&. Setting a value for log\&.date is similar to using +\fIgit log\fR\(aqs \fB\-\-date\fR -option\&.) Defaults to "default", which means to write dates like -\fBSat May 8 19:35:34 2010 \-0500\fR\&. +option\&. See +\fBgit-log\fR(1) +for details\&. .sp 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\&. .RE .PP +log\&.decorate +.RS 4 +Print out the ref names of any commits that are shown by the log command\&. If +\fIshort\fR +is specified, the ref name prefixes +\fIrefs/heads/\fR, +\fIrefs/tags/\fR +and +\fIrefs/remotes/\fR +will not be printed\&. If +\fIfull\fR +is specified, the full ref name (including prefix) will be printed\&. If +\fIauto\fR +is specified, then if the output is going to a terminal, the ref names are shown as if +\fIshort\fR +were given, otherwise no ref names are shown\&. This is the same as the +\fB\-\-decorate\fR +option of the +\fBgit log\fR\&. +.RE +.PP +log\&.initialDecorationSet +.RS 4 +By default, +\fBgit log\fR +only shows decorations for certain known ref namespaces\&. If +\fIall\fR +is specified, then show all refs as decorations\&. +.RE +.PP +log\&.excludeDecoration +.RS 4 +Exclude the specified patterns from the log decorations\&. This is similar to the +\fB\-\-decorate\-refs\-exclude\fR +command\-line option, but the config option can be overridden by the +\fB\-\-decorate\-refs\fR +option\&. +.RE +.PP +log\&.diffMerges +.RS 4 +Set default diff format to be used for merge commits\&. See +\fB\-\-diff\-merges\fR +in +\fBgit-log\fR(1) +for details\&. Defaults to +\fBseparate\fR\&. +.RE +.PP log\&.follow .RS 4 If @@ -4471,52 +4537,133 @@ option was used when a single <path> is given\&. This has the same limitations a \fB\-\-follow\fR, i\&.e\&. it cannot be used to follow multiple files and does not work well on non\-linear history\&. .RE .PP +log\&.graphColors +.RS 4 +A list of colors, separated by commas, that can be used to draw history lines in +\fBgit log \-\-graph\fR\&. +.RE +.PP log\&.showRoot .RS 4 -If -\fBfalse\fR, -\fBgit log\fR -and related commands will not treat the initial commit as a big creation event\&. Any root commits in -\fBgit log \-p\fR -output would be shown without a diff attached\&. The default is -\fBtrue\fR\&. +If true, the initial commit will be shown as a big creation event\&. This is equivalent to a diff against an empty tree\&. Tools like +\fBgit-log\fR(1) +or +\fBgit-whatchanged\fR(1), which normally hide the root commit will now show it\&. True by default\&. .RE .PP log\&.showSignature .RS 4 -If -\fBtrue\fR, -\fBgit log\fR -and related commands will act as if the -\fB\-\-show\-signature\fR -option was passed to them\&. +If true, makes +\fBgit-log\fR(1), +\fBgit-show\fR(1), and +\fBgit-whatchanged\fR(1) +assume +\fB\-\-show\-signature\fR\&. .RE .PP -mailmap\&.* +log\&.mailmap .RS 4 -See -\fBgit-shortlog\fR(1)\&. +If true, makes +\fBgit-log\fR(1), +\fBgit-show\fR(1), and +\fBgit-whatchanged\fR(1) +assume +\fB\-\-use\-mailmap\fR, otherwise assume +\fB\-\-no\-use\-mailmap\fR\&. True by default\&. +.RE +.PP +notes\&.mergeStrategy +.RS 4 +Which merge strategy to choose by default when resolving notes conflicts\&. Must be one of +\fBmanual\fR, +\fBours\fR, +\fBtheirs\fR, +\fBunion\fR, or +\fBcat_sort_uniq\fR\&. Defaults to +\fBmanual\fR\&. See "NOTES MERGE STRATEGIES" section of +\fBgit-notes\fR(1) +for more information on each strategy\&. +.sp +This setting can be overridden by passing the +\fB\-\-strategy\fR +option to +\fBgit-notes\fR(1)\&. +.RE +.PP +notes\&.<name>\&.mergeStrategy +.RS 4 +Which merge strategy to choose when doing a notes merge into refs/notes/<name>\&. This overrides the more general "notes\&.mergeStrategy"\&. See the "NOTES MERGE STRATEGIES" section in +\fBgit-notes\fR(1) +for more information on the available strategies\&. .RE .PP notes\&.displayRef .RS 4 -Which refs, in addition to the default set by +Which ref (or refs, if a glob or specified more than once), in addition to the default set by \fBcore\&.notesRef\fR or \fBGIT_NOTES_REF\fR, to read notes from when showing commit messages with the -\fBlog\fR -family of commands\&. See -\fBgit-notes\fR(1)\&. +\fIgit log\fR +family of commands\&. .sp -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 overridden with the +\fBGIT_NOTES_DISPLAY_REF\fR +environment variable, which must be a colon separated list of refs or globs\&. +.sp +A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored\&. .sp This setting can be disabled by the \fB\-\-no\-notes\fR -option, overridden by the -\fBGIT_NOTES_DISPLAY_REF\fR -environment variable, and overridden by the +option to the +\fIgit log\fR +family of commands, or by the \fB\-\-notes=<ref>\fR -option\&. +option accepted by those commands\&. +.sp +The effective value of "core\&.notesRef" (possibly overridden by GIT_NOTES_REF) is also implicitly added to the list of refs to be displayed\&. +.RE +.PP +notes\&.rewrite\&.<command> +.RS 4 +When rewriting commits with <command> (currently +\fBamend\fR +or +\fBrebase\fR), if this variable is +\fBfalse\fR, git will not copy notes from the original to the rewritten commit\&. Defaults to +\fBtrue\fR\&. See also "\fBnotes\&.rewriteRef\fR" below\&. +.sp +This setting can be overridden with the +\fBGIT_NOTES_REWRITE_REF\fR +environment variable, which must be a colon separated list of refs or globs\&. +.RE +.PP +notes\&.rewriteMode +.RS 4 +When copying notes during a rewrite (see the "notes\&.rewrite\&.<command>" option), determines what to do if the target commit already has a note\&. Must be one of +\fBoverwrite\fR, +\fBconcatenate\fR, +\fBcat_sort_uniq\fR, or +\fBignore\fR\&. Defaults to +\fBconcatenate\fR\&. +.sp +This setting can be overridden with the +\fBGIT_NOTES_REWRITE_MODE\fR +environment variable\&. +.RE +.PP +notes\&.rewriteRef +.RS 4 +When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied\&. May be a glob, in which case notes in all matching refs will be copied\&. You may also specify this configuration several times\&. +.sp +Does not have a default value; you must configure this variable to enable note rewriting\&. Set it to +\fBrefs/notes/commits\fR +to enable rewriting for the default commit notes\&. +.sp +Can be overridden with the +\fBGIT_NOTES_REWRITE_REF\fR +environment variable\&. See +\fBnotes\&.rewrite\&.<command>\fR +above for a further description of its format\&. .RE .SH "GIT" .sp |