summaryrefslogtreecommitdiffstats
path: root/git-log.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-12-03 14:07:11 -0800
committerJunio C Hamano <gitster@pobox.com>2013-12-03 14:07:11 -0800
commitb73af6c3bb75d464c5816f310eafe4af58c158a7 (patch)
tree6cb2ea7dedd3219b7377e188b10198805b9dce72 /git-log.html
parent6c7be4687b43e460af156641dede43df6fad8bef (diff)
downloadgit-htmldocs-b73af6c3bb75d464c5816f310eafe4af58c158a7.tar.gz
Autogenerated HTML docs for v1.8.5.1-19-gdaad3
Diffstat (limited to 'git-log.html')
-rw-r--r--git-log.html168
1 files changed, 84 insertions, 84 deletions
diff --git a/git-log.html b/git-log.html
index 81dfd6888..1730658ae 100644
--- a/git-log.html
+++ b/git-log.html
@@ -755,9 +755,9 @@ git-log(1) Manual Page
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>Shows the commit logs.</p></div>
-<div class="paragraph"><p>The command takes options applicable to the <em>git rev-list</em>
+<div class="paragraph"><p>The command takes options applicable to the <code>git rev-list</code>
command to control what is shown and how, and options applicable to
-the <em>git diff-*</em> commands to control how the changes
+the <code>git diff-*</code> commands to control how the changes
each commit introduces are shown.</p></div>
</div>
</div>
@@ -804,7 +804,7 @@ each commit introduces are shown.</p></div>
<dd>
<p>
Use mailmap file to map author and committer names and email
- to canonical real names and email addresses. See
+ addresses to canonical real names and email addresses. See
<a href="git-shortlog.html">git-shortlog(1)</a>.
</p>
</dd>
@@ -813,25 +813,24 @@ each commit introduces are shown.</p></div>
</dt>
<dd>
<p>
- Without this flag, "git log -p &lt;path&gt;&#8230;" shows commits that
+ Without this flag, <code>git log -p &lt;path&gt;...</code> shows commits that
touch the specified paths, and diffs about the same specified
paths. With this, the full diff is shown for commits that touch
the specified paths; this means that "&lt;path&gt;&#8230;" limits only
commits, and doesn&#8217;t limit diff for those commits.
</p>
<div class="paragraph"><p>Note that this affects all diff-based output types, e.g. those
-produced by --stat etc.</p></div>
+produced by <code>--stat</code>, etc.</p></div>
</dd>
<dt class="hdlist1">
--log-size
</dt>
<dd>
<p>
- Before the log message print out its size in bytes. Intended
- mainly for porcelain tools consumption. If Git is unable to
- produce a valid value size is set to zero.
- Note that only message is considered, if also a diff is shown
- its size is not included.
+ Include a line &#8220;log size &lt;number&gt;&#8221; in the output for each commit,
+ where &lt;number&gt; is the length of that commit&#8217;s message in bytes.
+ Intended to speed up tools that read log messages from <code>git log</code>
+ output by allowing them to allocate space in advance.
</p>
</dd>
<dt class="hdlist1">
@@ -893,7 +892,7 @@ if any, otherwise from the start of file.
whole history leading to the current commit). <code>origin..HEAD</code>
specifies all the commits reachable from the current commit
(i.e. <code>HEAD</code>), but not from <code>origin</code>. For a complete list of
- ways to spell &lt;revision range&gt;, see the "Specifying Ranges"
+ ways to spell &lt;revision range&gt;, see the <em>Specifying Ranges</em>
section of <a href="gitrevisions.html">gitrevisions(7)</a>.
</p>
</dd>
@@ -903,11 +902,11 @@ if any, otherwise from the start of file.
<dd>
<p>
Show only commits that are enough to explain how the files
- that match the specified paths came to be. See "History
- Simplification" below for details and other simplification
+ that match the specified paths came to be. See <em>History
+ Simplification</em> below for details and other simplification
modes.
</p>
-<div class="paragraph"><p>Paths may need to be prefixed with "-- " to separate them from
+<div class="paragraph"><p>Paths may need to be prefixed with &#8216;`-- '&#8217; to separate them from
options or the revision range, when confusion arises.</p></div>
</dd>
</dl></div>
@@ -1015,7 +1014,7 @@ if it is part of the log message.</p></div>
</dt>
<dd>
<p>
- Limit the commits output to ones that match all given --grep,
+ Limit the commits output to ones that match all given <code>--grep</code>,
instead of ones that match at least one.
</p>
</dd>
@@ -1027,7 +1026,8 @@ if it is part of the log message.</p></div>
</dt>
<dd>
<p>
- Match the regexp limiting patterns without regard to letters case.
+ Match the regular expression limiting patterns without regard to letter
+ case.
</p>
</dd>
<dt class="hdlist1">
@@ -1068,7 +1068,7 @@ if it is part of the log message.</p></div>
</dt>
<dd>
<p>
- Consider the limiting patterns to be Perl-compatible regexp.
+ Consider the limiting patterns to be Perl-compatible regular expressions.
Requires libpcre to be compiled in.
</p>
</dd>
@@ -1140,7 +1140,7 @@ parents) and <code>--max-parents=-1</code> (negative numbers denote no upper lim
<dd>
<p>
Reverses the meaning of the <em>&#94;</em> prefix (or lack thereof)
- for all following revision specifiers, up to the next <em>--not</em>.
+ for all following revision specifiers, up to the next <code>--not</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1242,15 +1242,15 @@ parents) and <code>--max-parents=-1</code> (negative numbers denote no upper lim
<dd>
<p>
Omit any commit that introduces the same change as
- another commit on the "other side" when the set of
+ another commit on the &#8220;other side&#8221; when the set of
commits are limited with symmetric difference.
</p>
<div class="paragraph"><p>For example, if you have two branches, <code>A</code> and <code>B</code>, a usual way
to list all commits on only one side of them is with
<code>--left-right</code> (see the example below in the description of
-the <code>--left-right</code> option). It however shows the commits that were cherry-picked
-from the other branch (for example, "3rd on b" may be cherry-picked
-from branch A). With this option, such pairs of commits are
+the <code>--left-right</code> option). However, it shows the commits that were
+cherry-picked from the other branch (for example, &#8220;3rd on b&#8221; may be
+cherry-picked from branch A). With this option, such pairs of commits are
excluded from the output.</p></div>
</dd>
<dt class="hdlist1">
@@ -1297,14 +1297,14 @@ list.</p></div>
exclude (that is, <em>&#94;commit</em>, <em>commit1..commit2</em>,
nor <em>commit1...commit2</em> notations cannot be used).
</p>
-<div class="paragraph"><p>With <em>--pretty</em> format other than oneline (for obvious reasons),
+<div class="paragraph"><p>With <code>--pretty</code> format other than <code>oneline</code> (for obvious reasons),
this causes the output to have two extra lines of information
taken from the reflog. By default, <em>commit@{Nth}</em> notation is
used in the output. When the starting commit is specified as
<em>commit@{now}</em>, output also uses <em>commit@{timestamp}</em> notation
-instead. Under <em>--pretty=oneline</em>, the commit message is
+instead. Under <code>--pretty=oneline</code>, the commit message is
prefixed with this information on the same line.
-This option cannot be combined with <em>--reverse</em>.
+This option cannot be combined with <code>--reverse</code>.
See also <a href="git-reflog.html">git-reflog(1)</a>.</p></div>
</dd>
<dt class="hdlist1">
@@ -1397,7 +1397,7 @@ Default mode
</dt>
<dd>
<p>
- Additional option to <em>--full-history</em> to remove some needless
+ Additional option to <code>--full-history</code> to remove some needless
merges from the resulting history, as there are no selected
commits contributing to this merge.
</p>
@@ -1436,13 +1436,13 @@ each merge. The commits are:</p></div>
<li>
<p>
<code>I</code> is the initial commit, in which <code>foo</code> exists with contents
- "asdf", and a file <code>quux</code> exists with contents "quux". Initial
+ &#8220;asdf&#8221;, and a file <code>quux</code> exists with contents &#8220;quux&#8221;. Initial
commits are compared to an empty tree, so <code>I</code> is !TREESAME.
</p>
</li>
<li>
<p>
-In <code>A</code>, <code>foo</code> contains just "foo".
+In <code>A</code>, <code>foo</code> contains just &#8220;foo&#8221;.
</p>
</li>
<li>
@@ -1453,20 +1453,20 @@ In <code>A</code>, <code>foo</code> contains just "foo".
</li>
<li>
<p>
-<code>C</code> does not change <code>foo</code>, but its merge <code>N</code> changes it to "foobar",
+<code>C</code> does not change <code>foo</code>, but its merge <code>N</code> changes it to &#8220;foobar&#8221;,
so it is not TREESAME to any parent.
</p>
</li>
<li>
<p>
-<code>D</code> sets <code>foo</code> to "baz". Its merge <code>O</code> combines the strings from
- <code>N</code> and <code>D</code> to "foobarbaz"; i.e., it is not TREESAME to any parent.
+<code>D</code> sets <code>foo</code> to &#8220;baz&#8221;. Its merge <code>O</code> combines the strings from
+ <code>N</code> and <code>D</code> to &#8220;foobarbaz&#8221;; i.e., it is not TREESAME to any parent.
</p>
</li>
<li>
<p>
-<code>E</code> changes <code>quux</code> to "xyzzy", and its merge <code>P</code> combines the
- strings to "quux xyzzy". <code>P</code> is TREESAME to <code>O</code>, but not to <code>E</code>.
+<code>E</code> changes <code>quux</code> to &#8220;xyzzy&#8221;, and its merge <code>P</code> combines the
+ strings to &#8220;quux xyzzy&#8221;. <code>P</code> is TREESAME to <code>O</code>, but not to <code>E</code>.
</p>
</li>
<li>
@@ -1477,9 +1477,9 @@ In <code>A</code>, <code>foo</code> contains just "foo".
</p>
</li>
</ul></div>
-<div class="paragraph"><p><em>rev-list</em> walks backwards through history, including or excluding
-commits based on whether <em>--full-history</em> and/or parent rewriting
-(via <em>--parents</em> or <em>--children</em>) are used. The following settings
+<div class="paragraph"><p><code>rev-list</code> walks backwards through history, including or excluding
+commits based on whether <code>--full-history</code> and/or parent rewriting
+(via <code>--parents</code> or <code>--children</code>) are used. The following settings
are available.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
@@ -1488,7 +1488,7 @@ Default mode
<dd>
<p>
Commits are included if they are not TREESAME to any parent
- (though this can be changed, see <em>--sparse</em> below). If the
+ (though this can be changed, see <code>--sparse</code> below). If the
commit was a merge, and it was TREESAME to one parent, follow
only that parent. (Even if there are several TREESAME
parents, follow only one of them.) Otherwise, follow all
@@ -1505,7 +1505,7 @@ Default mode
available, removed <code>B</code> from consideration entirely. <code>C</code> was
considered via <code>N</code>, but is TREESAME. Root commits are compared to an
empty tree, so <code>I</code> is !TREESAME.</p></div>
-<div class="paragraph"><p>Parent/child relations are only visible with --parents, but that does
+<div class="paragraph"><p>Parent/child relations are only visible with <code>--parents</code>, but that does
not affect the commits selected in default mode, so we have shown the
parent lines.</p></div>
</dd>
@@ -1537,7 +1537,7 @@ them disconnected.</p></div>
<dd>
<p>
Ordinary commits are only included if they are !TREESAME
- (though this can be changed, see <em>--sparse</em> below).
+ (though this can be changed, see <code>--sparse</code> below).
</p>
<div class="paragraph"><p>Merges are always included. However, their parent list is rewritten:
Along each parent, prune away commits that are not included
@@ -1550,7 +1550,7 @@ themselves. This results in</p></div>
\ / / / /
`-------------'</code></pre>
</div></div>
-<div class="paragraph"><p>Compare to <em>--full-history</em> without rewriting above. Note that <code>E</code>
+<div class="paragraph"><p>Compare to <code>--full-history</code> without rewriting above. Note that <code>E</code>
was pruned away because it is TREESAME, but the parent list of P was
rewritten to contain <code>E</code>'s parent <code>I</code>. The same happened for <code>C</code> and
<code>N</code>, and <code>X</code>, <code>Y</code> and <code>Q</code>.</p></div>
@@ -1575,7 +1575,7 @@ affects inclusion:</p></div>
<p>
All commits that are walked are included.
</p>
-<div class="paragraph"><p>Note that without <em>--full-history</em>, this still simplifies merges: if
+<div class="paragraph"><p>Note that without <code>--full-history</code>, this still simplifies merges: if
one of the parents is TREESAME, we follow only that one, so the other
sides of the merge are never walked.</p></div>
</dd>
@@ -1585,7 +1585,7 @@ sides of the merge are never walked.</p></div>
<dd>
<p>
First, build a history graph in the same way that
- <em>--full-history</em> with parent rewriting does (see above).
+ <code>--full-history</code> with parent rewriting does (see above).
</p>
<div class="paragraph"><p>Then simplify each commit <code>C</code> to its replacement <code>C'</code> in the final
history according to the following rules:</p></div>
@@ -1615,7 +1615,7 @@ If after this parent rewriting, <code>C'</code> is a root or merge commit (has
</ul></div>
</div></div>
<div class="paragraph"><p>The effect of this is best shown by way of comparing to
-<em>--full-history</em> with parent rewriting. The example turns into:</p></div>
+<code>--full-history</code> with parent rewriting. The example turns into:</p></div>
<div class="listingblock">
<div class="content">
<pre><code> .-A---M---N---O
@@ -1624,7 +1624,7 @@ If after this parent rewriting, <code>C'</code> is a root or merge commit (has
\ / /
`---------'</code></pre>
</div></div>
-<div class="paragraph"><p>Note the major differences in <code>N</code>, <code>P</code> and <code>Q</code> over <em>--full-history</em>:</p></div>
+<div class="paragraph"><p>Note the major differences in <code>N</code>, <code>P</code>, and <code>Q</code> over <code>--full-history</code>:</p></div>
<div class="openblock">
<div class="content">
<div class="ulist"><ul>
@@ -1659,9 +1659,9 @@ If after this parent rewriting, <code>C'</code> is a root or merge commit (has
<dd>
<p>
Limit the displayed commits to those directly on the ancestry
- chain between the "from" and "to" commits in the given commit
- range. I.e. only display commits that are ancestor of the "to"
- commit, and descendants of the "from" commit.
+ chain between the &#8220;from&#8221; and &#8220;to&#8221; commits in the given commit
+ range. I.e. only display commits that are ancestor of the &#8220;to&#8221;
+ commit and descendants of the &#8220;from&#8221; commit.
</p>
<div class="paragraph"><p>As an example use case, consider the following commit history:</p></div>
<div class="listingblock">
@@ -1675,13 +1675,13 @@ If after this parent rewriting, <code>C'</code> is a root or merge commit (has
<div class="paragraph"><p>A regular <em>D..M</em> computes the set of commits that are ancestors of <code>M</code>,
but excludes the ones that are ancestors of <code>D</code>. This is useful to see
what happened to the history leading to <code>M</code> since <code>D</code>, in the sense
-that "what does <code>M</code> have that did not exist in <code>D</code>". The result in this
+that &#8220;what does <code>M</code> have that did not exist in <code>D</code>&#8221;. The result in this
example would be all the commits, except <code>A</code> and <code>B</code> (and <code>D</code> itself,
of course).</p></div>
<div class="paragraph"><p>When we want to find out what commits in <code>M</code> are contaminated with the
bug introduced by <code>D</code> and need fixing, however, we might want to view
only the subset of <em>D..M</em> that are actually descendants of <code>D</code>, i.e.
-excluding <code>C</code> and <code>K</code>. This is exactly what the <em>--ancestry-path</em>
+excluding <code>C</code> and <code>K</code>. This is exactly what the <code>--ancestry-path</code>
option does. Applied to the <em>D..M</em> range, it results in:</p></div>
<div class="listingblock">
<div class="content">
@@ -1693,7 +1693,7 @@ option does. Applied to the <em>D..M</em> range, it results in:</p></div>
</div></div>
</dd>
</dl></div>
-<div class="paragraph"><p>The <em>--simplify-by-decoration</em> option allows you to view only the
+<div class="paragraph"><p>The <code>--simplify-by-decoration</code> option allows you to view only the
big picture of the topology of the history, by omitting commits
that are not referenced by tags. Commits are marked as !TREESAME
(in other words, kept after history simplification rules described
@@ -1753,7 +1753,7 @@ together.</p></div>
<dd>
<p>
Output the commits in reverse order.
- Cannot be combined with <em>--walk-reflogs</em>.
+ Cannot be combined with <code>--walk-reflogs</code>.
</p>
</dd>
</dl></div>
@@ -1768,9 +1768,9 @@ together.</p></div>
<dd>
<p>
Print the object IDs of any object referenced by the listed
- commits. <em>--objects foo ^bar</em> thus means "send me
+ commits. <code>--objects foo ^bar</code> thus means &#8220;send me
all object IDs which I need to download if I have the commit
- object <em>bar</em>, but not <em>foo</em>".
+ object <em>bar</em> but not <em>foo</em>&#8221;.
</p>
</dd>
<dt class="hdlist1">
@@ -1778,9 +1778,9 @@ together.</p></div>
</dt>
<dd>
<p>
- Similar to <em>--objects</em>, but also print the IDs of excluded
- commits prefixed with a "-" character. This is used by
- <a href="git-pack-objects.html">git-pack-objects(1)</a> to build "thin" pack, which records
+ Similar to <code>--objects</code>, but also print the IDs of excluded
+ commits prefixed with a &#8220;-&#8221; character. This is used by
+ <a href="git-pack-objects.html">git-pack-objects(1)</a> to build &#8220;thin&#8221; pack, which records
objects in deltified form based on objects contained in these
excluded commits to reduce network traffic.
</p>
@@ -1790,7 +1790,7 @@ together.</p></div>
</dt>
<dd>
<p>
- Only useful with <em>--objects</em>; print the object IDs that are not
+ Only useful with <code>--objects</code>; print the object IDs that are not
in packs.
</p>
</dd>
@@ -1801,9 +1801,9 @@ together.</p></div>
<p>
Only show the given commits, but do not traverse their ancestors.
This has no effect if a range is specified. If the argument
- "unsorted" is given, the commits are show in the order they were
- given on the command line. Otherwise (if "sorted" or no argument
- was given), the commits are show in reverse chronological order
+ <code>unsorted</code> is given, the commits are shown in the order they were
+ given on the command line. Otherwise (if <code>sorted</code> or no argument
+ was given), the commits are shown in reverse chronological order
by commit time.
</p>
</dd>
@@ -1812,7 +1812,7 @@ together.</p></div>
</dt>
<dd>
<p>
- Overrides a previous --no-walk.
+ Overrides a previous <code>--no-walk</code>.
</p>
</dd>
</dl></div>
@@ -1950,16 +1950,16 @@ being displayed. Examples: "--notes=foo" will show only notes from
<dd>
<p>
Only takes effect for dates shown in human-readable format, such
- as when using "--pretty". <code>log.date</code> config variable sets a default
- value for log command&#8217;s --date option.
+ as when using <code>--pretty</code>. <code>log.date</code> config variable sets a default
+ value for the log command&#8217;s <code>--date</code> option.
</p>
<div class="paragraph"><p><code>--date=relative</code> shows dates relative to the current time,
-e.g. "2 hours ago".</p></div>
+e.g. &#8220;2 hours ago&#8221;.</p></div>
<div class="paragraph"><p><code>--date=local</code> shows timestamps in user&#8217;s local time zone.</p></div>
<div class="paragraph"><p><code>--date=iso</code> (or <code>--date=iso8601</code>) shows timestamps in ISO 8601 format.</p></div>
<div class="paragraph"><p><code>--date=rfc</code> (or <code>--date=rfc2822</code>) shows timestamps in RFC 2822
-format, often found in E-mail messages.</p></div>
-<div class="paragraph"><p><code>--date=short</code> shows only date but not time, in <code>YYYY-MM-DD</code> format.</p></div>
+format, often found in email messages.</p></div>
+<div class="paragraph"><p><code>--date=short</code> shows only the date, but not the time, in <code>YYYY-MM-DD</code> format.</p></div>
<div class="paragraph"><p><code>--date=raw</code> shows the date in the internal raw Git format <code>%s %z</code> format.</p></div>
<div class="paragraph"><p><code>--date=default</code> shows timestamps in the original time zone
(either committer&#8217;s or author&#8217;s).</p></div>
@@ -2025,14 +2025,14 @@ format, often found in E-mail messages.</p></div>
to be drawn properly.
</p>
<div class="paragraph"><p>This enables parent rewriting, see <em>History Simplification</em> below.</p></div>
-<div class="paragraph"><p>This implies the <em>--topo-order</em> option by default, but the
-<em>--date-order</em> option may also be specified.</p></div>
+<div class="paragraph"><p>This implies the <code>--topo-order</code> option by default, but the
+<code>--date-order</code> option may also be specified.</p></div>
</dd>
</dl></div>
</div>
<div class="sect2">
<h3 id="_diff_formatting">Diff Formatting</h3>
-<div class="paragraph"><p>Below are listed options that control the formatting of diff output.
+<div class="paragraph"><p>Listed below are options that control the formatting of diff output.
Some of them are specific to <a href="git-rev-list.html">git-rev-list(1)</a>, however other diff
options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> for more options.</p></div>
<div class="dlist"><dl>
@@ -2053,7 +2053,7 @@ options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> fo
</dt>
<dd>
<p>
- This flag implies the <em>-c</em> option and further compresses the
+ This flag implies the <code>-c</code> option and further compresses the
patch output by omitting uninteresting hunks whose contents in
the parents have only two variants and the merge result picks
one of them without modification.
@@ -2067,7 +2067,7 @@ options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> fo
This flag makes the merge commits show the full diff like
regular commits; for each merge parent, a separate log entry
and diff is generated. An exception is that only diff against
- the first parent is shown when <em>--first-parent</em> option is given;
+ the first parent is shown when <code>--first-parent</code> option is given;
in that case, the output represents the changes the merge
brought <em>into</em> the then-current branch.
</p>
@@ -2085,7 +2085,7 @@ options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> fo
</dt>
<dd>
<p>
- Show the tree objects in the diff output. This implies <em>-r</em>.
+ Show the tree objects in the diff output. This implies <code>-r</code>.
</p>
</dd>
</dl></div>
@@ -3689,7 +3689,7 @@ two unresolved merge parents with the working tree file
<dd>
<p>
Show all commits since version <em>v2.6.12</em> that changed any file
- in the include/scsi or drivers/scsi subdirectories
+ in the <code>include/scsi</code> or <code>drivers/scsi</code> subdirectories
</p>
</dd>
<dt class="hdlist1">
@@ -3698,7 +3698,7 @@ two unresolved merge parents with the working tree file
<dd>
<p>
Show the changes during the last two weeks to the file <em>gitk</em>.
- The "--" is necessary to avoid confusion with the <strong>branch</strong> named
+ The &#8220;--&#8221; is necessary to avoid confusion with the <strong>branch</strong> named
<em>gitk</em>
</p>
</dd>
@@ -3717,7 +3717,7 @@ two unresolved merge parents with the working tree file
</dt>
<dd>
<p>
- Shows the commits that changed builtin/rev-list.c, including
+ Shows the commits that changed <code>builtin/rev-list.c</code>, including
those commits that occurred before the file was given its
present name.
</p>
@@ -3747,7 +3747,7 @@ two unresolved merge parents with the working tree file
<dd>
<p>
Shows the history including change diffs, but only from the
- "main branch" perspective, skipping commits that come from merged
+ &#8220;main branch&#8221; perspective, skipping commits that come from merged
branches, and showing full diffs of changes introduced by the merges.
This makes sense only when following a strict policy of merging all
topic branches when staying on a single integration branch.
@@ -3758,7 +3758,7 @@ two unresolved merge parents with the working tree file
</dt>
<dd>
<p>
- Shows how the function <code>main()</code> in the file <em>main.c</em> evolved
+ Shows how the function <code>main()</code> in the file <code>main.c</code> evolved
over time.
</p>
</dd>
@@ -3861,8 +3861,8 @@ format.pretty
</dt>
<dd>
<p>
- Default for the <code>--format</code> option. (See "PRETTY FORMATS" above.)
- Defaults to "medium".
+ Default for the <code>--format</code> option. (See <em>Pretty Formats</em> above.)
+ Defaults to <code>medium</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -3870,8 +3870,8 @@ i18n.logOutputEncoding
</dt>
<dd>
<p>
- Encoding to use when displaying logs. (See "Discussion", above.)
- Defaults to the value of <code>i18n.commitEncoding</code> if set, UTF-8
+ Encoding to use when displaying logs. (See <em>Discussion</em> above.)
+ Defaults to the value of <code>i18n.commitEncoding</code> if set, and UTF-8
otherwise.
</p>
</dd>
@@ -3890,7 +3890,7 @@ log.showroot
</dt>
<dd>
<p>
- If <code>false</code>, <em>git log</em> and related commands will not treat the
+ 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>.
@@ -3911,7 +3911,7 @@ notes.displayRef
<p>
Which refs, in addition to the default set by <code>core.notesRef</code>
or <em>GIT_NOTES_REF</em>, to read notes from when showing commit
- messages with the <em>log</em> family of commands. See
+ messages with the <code>log</code> family of commands. See
<a href="git-notes.html">git-notes(1)</a>.
</p>
<div class="paragraph"><p>May be an unabbreviated ref name or a glob and may be specified
@@ -3934,7 +3934,7 @@ and overridden by the <code>--notes=&lt;ref&gt;</code> option.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-09-09 15:34:20 PDT
+Last updated 2013-12-03 14:06:33 PST
</div>
</div>
</body>