diff options
Diffstat (limited to 'git-log.html')
| -rw-r--r-- | git-log.html | 187 |
1 files changed, 166 insertions, 21 deletions
diff --git a/git-log.html b/git-log.html index 8ab3c3000..a1f3e1e16 100644 --- a/git-log.html +++ b/git-log.html @@ -5336,20 +5336,81 @@ i18n.logOutputEncoding otherwise.
</p>
</dd>
+</dl></div>
+<div class="paragraph"><p>Everything above this line in this section isn’t included from the
+<a href="git-config.html">git-config(1)</a> documentation. The content that follows is the
+same as what’s found there:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+log.abbrevCommit
+</dt>
+<dd>
+<p>
+ If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
+ <a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--abbrev-commit</code>. You may
+ override this option with <code>--no-abbrev-commit</code>.
+</p>
+</dd>
<dt class="hdlist1">
log.date
</dt>
<dd>
<p>
- Default format for human-readable dates. (Compare the
- <code>--date</code> option.) Defaults to "default", which means to write
- dates like <code>Sat May 8 19:35:34 2010 -0500</code>.
+ Set the default date-time mode for the <em>log</em> command.
+ Setting a value for log.date is similar to using <em>git log</em>'s
+ <code>--date</code> option. See <a href="git-log.html">git-log(1)</a> for details.
</p>
<div class="paragraph"><p>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.</p></div>
</dd>
<dt class="hdlist1">
+log.decorate
+</dt>
+<dd>
+<p>
+ Print out the ref names of any commits that are shown by the log
+ command. If <em>short</em> is specified, the ref name prefixes <em>refs/heads/</em>,
+ <em>refs/tags/</em> and <em>refs/remotes/</em> will not be printed. If <em>full</em> is
+ specified, the full ref name (including prefix) will be printed.
+ If <em>auto</em> is specified, then if the output is going to a terminal,
+ the ref names are shown as if <em>short</em> were given, otherwise no ref
+ names are shown. This is the same as the <code>--decorate</code> option
+ of the <code>git log</code>.
+</p>
+</dd>
+<dt class="hdlist1">
+log.initialDecorationSet
+</dt>
+<dd>
+<p>
+ By default, <code>git log</code> only shows decorations for certain known ref
+ namespaces. If <em>all</em> is specified, then show all refs as
+ decorations.
+</p>
+</dd>
+<dt class="hdlist1">
+log.excludeDecoration
+</dt>
+<dd>
+<p>
+ Exclude the specified patterns from the log decorations. This is
+ similar to the <code>--decorate-refs-exclude</code> command-line option, but
+ the config option can be overridden by the <code>--decorate-refs</code>
+ option.
+</p>
+</dd>
+<dt class="hdlist1">
+log.diffMerges
+</dt>
+<dd>
+<p>
+ Set default diff format to be used for merge commits. See
+ <code>--diff-merges</code> in <a href="git-log.html">git-log(1)</a> for details.
+ Defaults to <code>separate</code>.
+</p>
+</dd>
+<dt class="hdlist1">
log.follow
</dt>
<dd>
@@ -5361,14 +5422,23 @@ log.follow </p>
</dd>
<dt class="hdlist1">
+log.graphColors
+</dt>
+<dd>
+<p>
+ A list of colors, separated by commas, that can be used to draw
+ history lines in <code>git log --graph</code>.
+</p>
+</dd>
+<dt class="hdlist1">
log.showRoot
</dt>
<dd>
<p>
- If <code>false</code>, <code>git log</code> and related commands will not treat the
- initial commit as a big creation event. Any root commits in
- <code>git log -p</code> output would be shown without a diff attached.
- The default is <code>true</code>.
+ 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 <a href="git-log.html">git-log(1)</a> or <a href="git-whatchanged.html">git-whatchanged(1)</a>, which
+ normally hide the root commit will now show it. True by default.
</p>
</dd>
<dt class="hdlist1">
@@ -5376,16 +5446,42 @@ log.showSignature </dt>
<dd>
<p>
- If <code>true</code>, <code>git log</code> and related commands will act as if the
- <code>--show-signature</code> option was passed to them.
+ If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
+ <a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--show-signature</code>.
</p>
</dd>
<dt class="hdlist1">
-mailmap.*
+log.mailmap
</dt>
<dd>
<p>
- See <a href="git-shortlog.html">git-shortlog(1)</a>.
+ If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
+ <a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--use-mailmap</code>, otherwise
+ assume <code>--no-use-mailmap</code>. True by default.
+</p>
+</dd>
+<dt class="hdlist1">
+notes.mergeStrategy
+</dt>
+<dd>
+<p>
+ Which merge strategy to choose by default when resolving notes
+ conflicts. Must be one of <code>manual</code>, <code>ours</code>, <code>theirs</code>, <code>union</code>, or
+ <code>cat_sort_uniq</code>. Defaults to <code>manual</code>. See "NOTES MERGE STRATEGIES"
+ section of <a href="git-notes.html">git-notes(1)</a> for more information on each strategy.
+</p>
+<div class="paragraph"><p>This setting can be overridden by passing the <code>--strategy</code> option to
+<a href="git-notes.html">git-notes(1)</a>.</p></div>
+</dd>
+<dt class="hdlist1">
+notes.<name>.mergeStrategy
+</dt>
+<dd>
+<p>
+ 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
+ <a href="git-notes.html">git-notes(1)</a> for more information on the available strategies.
</p>
</dd>
<dt class="hdlist1">
@@ -5393,17 +5489,66 @@ notes.displayRef </dt>
<dd>
<p>
- Which refs, in addition to the default set by <code>core.notesRef</code>
- or <code>GIT_NOTES_REF</code>, to read notes from when showing commit
- messages with the <code>log</code> family of commands. See
- <a href="git-notes.html">git-notes(1)</a>.
+ Which ref (or refs, if a glob or specified more than once), in
+ addition to the default set by <code>core.notesRef</code> or
+ <code>GIT_NOTES_REF</code>, to read notes from when showing commit
+ messages with the <em>git log</em> family of commands.
</p>
-<div class="paragraph"><p>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,
+<div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_DISPLAY_REF</code>
+environment variable, which must be a colon separated list of refs or
+globs.</p></div>
+<div class="paragraph"><p>A warning will be issued for refs that do not exist,
but a glob that does not match any refs is silently ignored.</p></div>
-<div class="paragraph"><p>This setting can be disabled by the <code>--no-notes</code> option,
-overridden by the <code>GIT_NOTES_DISPLAY_REF</code> environment variable,
-and overridden by the <code>--notes=<ref></code> option.</p></div>
+<div class="paragraph"><p>This setting can be disabled by the <code>--no-notes</code> option to the <em>git
+log</em> family of commands, or by the <code>--notes=<ref></code> option accepted by
+those commands.</p></div>
+<div class="paragraph"><p>The effective value of "core.notesRef" (possibly overridden by
+GIT_NOTES_REF) is also implicitly added to the list of refs to be
+displayed.</p></div>
+</dd>
+<dt class="hdlist1">
+notes.rewrite.<command>
+</dt>
+<dd>
+<p>
+ When rewriting commits with <command> (currently <code>amend</code> or
+ <code>rebase</code>), if this variable is <code>false</code>, git will not copy
+ notes from the original to the rewritten commit. Defaults to
+ <code>true</code>. See also "<code>notes.rewriteRef</code>" below.
+</p>
+<div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_REWRITE_REF</code>
+environment variable, which must be a colon separated list of refs or
+globs.</p></div>
+</dd>
+<dt class="hdlist1">
+notes.rewriteMode
+</dt>
+<dd>
+<p>
+ 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
+ <code>overwrite</code>, <code>concatenate</code>, <code>cat_sort_uniq</code>, or <code>ignore</code>.
+ Defaults to <code>concatenate</code>.
+</p>
+<div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_REWRITE_MODE</code>
+environment variable.</p></div>
+</dd>
+<dt class="hdlist1">
+notes.rewriteRef
+</dt>
+<dd>
+<p>
+ 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.
+</p>
+<div class="paragraph"><p>Does not have a default value; you must configure this variable to
+enable note rewriting. Set it to <code>refs/notes/commits</code> to enable
+rewriting for the default commit notes.</p></div>
+<div class="paragraph"><p>Can be overridden with the <code>GIT_NOTES_REWRITE_REF</code> environment variable.
+See <code>notes.rewrite.<command></code> above for a further description of its format.</p></div>
</dd>
</dl></div>
</div>
@@ -5419,7 +5564,7 @@ and overridden by the <code>--notes=<ref></code> option.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-30 10:56:31 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
|