Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Autogenerated HTML docs for v1.8.5.1-19-gdaad3

  • Loading branch information...
commit b73af6c3bb75d464c5816f310eafe4af58c158a7 1 parent 6c7be46
@gitster authored
View
9 RelNotes/1.8.5.1.txt
@@ -0,0 +1,9 @@
+Git v1.8.5.1 Release Notes
+==========================
+
+Fixes since v1.8.5
+------------------
+
+ * "git submodule init" copied "submodule.$name.update" settings from
+ .gitmodules to .git/config without making sure if the suggested
+ value was sensible.
View
24 git-fetch-pack.html
@@ -749,7 +749,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<pre class="content"><em>git fetch-pack</em> [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag]
[--upload-pack=&lt;git-upload-pack&gt;]
[--depth=&lt;n&gt;] [--no-progress]
- [-v] [&lt;host&gt;:]&lt;directory&gt; [&lt;refs&gt;&#8230;]</pre>
+ [-v] &lt;repository&gt; [&lt;refs&gt;&#8230;]</pre>
<div class="attribution">
</div></div>
</div>
@@ -902,21 +902,11 @@ <h2 id="_options">OPTIONS</h2>
</p>
</dd>
<dt class="hdlist1">
-&lt;host&gt;
+&lt;repository&gt;
</dt>
<dd>
<p>
- A remote host that houses the repository. When this
- part is specified, <em>git-upload-pack</em> is invoked via
- ssh.
-</p>
-</dd>
-<dt class="hdlist1">
-&lt;directory&gt;
-</dt>
-<dd>
-<p>
- The repository to sync from.
+ The URL to the remote repository.
</p>
</dd>
<dt class="hdlist1">
@@ -933,6 +923,12 @@ <h2 id="_options">OPTIONS</h2>
</div>
</div>
<div class="sect1">
+<h2 id="_see_also">SEE ALSO</h2>
+<div class="sectionbody">
+<div class="paragraph"><p><a href="git-fetch.html">git-fetch(1)</a></p></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
@@ -942,7 +938,7 @@ <h2 id="_git">GIT</h2>
<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>
View
15 git-fetch-pack.txt
@@ -12,7 +12,7 @@ SYNOPSIS
'git fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag]
[--upload-pack=<git-upload-pack>]
[--depth=<n>] [--no-progress]
- [-v] [<host>:]<directory> [<refs>...]
+ [-v] <repository> [<refs>...]
DESCRIPTION
-----------
@@ -97,19 +97,18 @@ be in a separate packet, and the list must end with a flush packet.
-v::
Run verbosely.
-<host>::
- A remote host that houses the repository. When this
- part is specified, 'git-upload-pack' is invoked via
- ssh.
-
-<directory>::
- The repository to sync from.
+<repository>::
+ The URL to the remote repository.
<refs>...::
The remote heads to update from. This is relative to
$GIT_DIR (e.g. "HEAD", "refs/heads/master"). When
unspecified, update from all heads the remote side has.
+SEE ALSO
+--------
+linkgit:git-fetch[1]
+
GIT
---
Part of the linkgit:git[1] suite
View
168 git-log.html
@@ -755,9 +755,9 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<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 @@ <h2 id="_options">OPTIONS</h2>
<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 @@ <h2 id="_options">OPTIONS</h2>
</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 @@ <h2 id="_options">OPTIONS</h2>
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 @@ <h2 id="_options">OPTIONS</h2>
<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 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
</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 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
</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 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
</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 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
<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 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
<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 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
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 @@ <h3 id="_history_simplification">History Simplification</h3>
</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 @@ <h3 id="_history_simplification">History Simplification</h3>
<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 @@ <h3 id="_history_simplification">History Simplification</h3>
</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 @@ <h3 id="_history_simplification">History Simplification</h3>
</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 @@ <h3 id="_history_simplification">History Simplification</h3>
<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 @@ <h3 id="_history_simplification">History Simplification</h3>
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 @@ <h3 id="_history_simplification">History Simplification</h3>
<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 @@ <h3 id="_history_simplification">History Simplification</h3>
\ / / / /
`-------------'</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 @@ <h3 id="_history_simplification">History Simplification</h3>
<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 @@ <h3 id="_history_simplification">History Simplification</h3>
<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 @@ <h3 id="_history_simplification">History Simplification</h3>
</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 @@ <h3 id="_history_simplification">History Simplification</h3>
\ / /
`---------'</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 @@ <h3 id="_history_simplification">History Simplification</h3>
<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 @@ <h3 id="_history_simplification">History Simplification</h3>
<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 @@ <h3 id="_history_simplification">History Simplification</h3>
</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 @@ <h3 id="_commit_ordering">Commit Ordering</h3>
<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 @@ <h3 id="_object_traversal">Object Traversal</h3>
<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 @@ <h3 id="_object_traversal">Object Traversal</h3>
</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 @@ <h3 id="_object_traversal">Object Traversal</h3>
</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 @@ <h3 id="_object_traversal">Object Traversal</h3>
<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 @@ <h3 id="_object_traversal">Object Traversal</h3>
</dt>
<dd>
<p>
- Overrides a previous --no-walk.
+ Overrides a previous <code>--no-walk</code>.
</p>
</dd>
</dl></div>
@@ -1950,16 +1950,16 @@ <h3 id="_commit_formatting">Commit Formatting</h3>
<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 @@ <h3 id="_commit_formatting">Commit Formatting</h3>
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 @@ <h3 id="_diff_formatting">Diff Formatting</h3>
</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 @@ <h3 id="_diff_formatting">Diff Formatting</h3>
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 @@ <h3 id="_diff_formatting">Diff Formatting</h3>
</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 @@ <h2 id="_examples">EXAMPLES</h2>
<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 @@ <h2 id="_examples">EXAMPLES</h2>
<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 @@ <h2 id="_examples">EXAMPLES</h2>
</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 @@ <h2 id="_examples">EXAMPLES</h2>
<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 @@ <h2 id="_examples">EXAMPLES</h2>
</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 @@ <h2 id="_configuration">CONFIGURATION</h2>
</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 @@ <h2 id="_configuration">CONFIGURATION</h2>
</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 @@ <h2 id="_configuration">CONFIGURATION</h2>
</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 @@ <h2 id="_configuration">CONFIGURATION</h2>
<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 @@ <h2 id="_git">GIT</h2>
<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>
View
51 git-log.txt
@@ -15,9 +15,9 @@ DESCRIPTION
-----------
Shows the commit logs.
-The command takes options applicable to the 'git rev-list'
+The command takes options applicable to the `git rev-list`
command to control what is shown and how, and options applicable to
-the 'git diff-*' commands to control how the changes
+the `git diff-*` commands to control how the changes
each commit introduces are shown.
@@ -42,29 +42,27 @@ OPTIONS
--use-mailmap::
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
linkgit:git-shortlog[1].
--full-diff::
- Without this flag, "git log -p <path>..." shows commits that
+ Without this flag, `git log -p <path>...` 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 "<path>..." limits only
commits, and doesn't limit diff for those commits.
+
Note that this affects all diff-based output types, e.g. those
-produced by --stat etc.
+produced by `--stat`, etc.
--log-size::
- 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 ``log size <number>'' in the output for each commit,
+ where <number> is the length of that commit's message in bytes.
+ Intended to speed up tools that read log messages from `git log`
+ output by allowing them to allocate space in advance.
-L <start>,<end>:<file>::
-L :<regex>:<file>::
-
Trace the evolution of the line range given by "<start>,<end>"
(or the funcname regex <regex>) within the <file>. You may
not give any pathspec limiters. This is currently limited to
@@ -80,16 +78,16 @@ include::line-range-format.txt[]
whole history leading to the current commit). `origin..HEAD`
specifies all the commits reachable from the current commit
(i.e. `HEAD`), but not from `origin`. For a complete list of
- ways to spell <revision range>, see the "Specifying Ranges"
+ ways to spell <revision range>, see the 'Specifying Ranges'
section of linkgit:gitrevisions[7].
[\--] <path>...::
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 'History
+ Simplification' below for details and other simplification
modes.
+
-Paths may need to be prefixed with "\-- " to separate them from
+Paths may need to be prefixed with ``\-- '' to separate them from
options or the revision range, when confusion arises.
include::rev-list-options.txt[]
@@ -113,12 +111,12 @@ EXAMPLES
`git log v2.6.12.. include/scsi drivers/scsi`::
Show all commits since version 'v2.6.12' that changed any file
- in the include/scsi or drivers/scsi subdirectories
+ in the `include/scsi` or `drivers/scsi` subdirectories
`git log --since="2 weeks ago" -- gitk`::
Show the changes during the last two weeks to the file 'gitk'.
- The "--" is necessary to avoid confusion with the *branch* named
+ The ``--'' is necessary to avoid confusion with the *branch* named
'gitk'
`git log --name-status release..test`::
@@ -129,7 +127,7 @@ EXAMPLES
`git log --follow builtin/rev-list.c`::
- Shows the commits that changed builtin/rev-list.c, including
+ Shows the commits that changed `builtin/rev-list.c`, including
those commits that occurred before the file was given its
present name.
@@ -147,17 +145,18 @@ EXAMPLES
`git log -p -m --first-parent`::
Shows the history including change diffs, but only from the
- "main branch" perspective, skipping commits that come from merged
+ ``main branch'' 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.
`git log -L '/int main/',/^}/:main.c`::
- Shows how the function `main()` in the file 'main.c' evolved
+ Shows how the function `main()` in the file `main.c` evolved
over time.
`git log -3`::
+
Limits the number of commits to show to 3.
DISCUSSION
@@ -172,12 +171,12 @@ See linkgit:git-config[1] for core variables and linkgit:git-diff[1]
for settings related to diff generation.
format.pretty::
- Default for the `--format` option. (See "PRETTY FORMATS" above.)
- Defaults to "medium".
+ Default for the `--format` option. (See 'Pretty Formats' above.)
+ Defaults to `medium`.
i18n.logOutputEncoding::
- Encoding to use when displaying logs. (See "Discussion", above.)
- Defaults to the value of `i18n.commitEncoding` if set, UTF-8
+ Encoding to use when displaying logs. (See 'Discussion' above.)
+ Defaults to the value of `i18n.commitEncoding` if set, and UTF-8
otherwise.
log.date::
@@ -186,7 +185,7 @@ log.date::
dates like `Sat May 8 19:35:34 2010 -0500`.
log.showroot::
- If `false`, 'git log' and related commands will not treat the
+ 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`.
@@ -197,7 +196,7 @@ mailmap.*::
notes.displayRef::
Which refs, in addition to the default set by `core.notesRef`
or 'GIT_NOTES_REF', to read notes from when showing commit
- messages with the 'log' family of commands. See
+ messages with the `log` family of commands. See
linkgit:git-notes[1].
+
May be an unabbreviated ref name or a glob and may be specified
View
161 git-rev-list.html
@@ -958,7 +958,7 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
</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>
@@ -970,7 +970,8 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
</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">
@@ -1011,7 +1012,7 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
</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>
@@ -1083,7 +1084,7 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
<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">
@@ -1168,7 +1169,7 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
is primarily meant to allow the caller to
test the exit status to see if a range of objects is fully
connected (or not). It is faster than redirecting stdout
- to /dev/null as the output does not have to be formatted.
+ to <code>/dev/null</code> as the output does not have to be formatted.
</p>
</dd>
<dt class="hdlist1">
@@ -1186,15 +1187,15 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
<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">
@@ -1241,14 +1242,14 @@ <h3 id="_commit_limiting">Commit Limiting</h3>
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">
@@ -1341,7 +1342,7 @@ <h3 id="_history_simplification">History Simplification</h3>
</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>
@@ -1380,13 +1381,13 @@ <h3 id="_history_simplification">History Simplification</h3>
<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>
@@ -1397,20 +1398,20 @@ <h3 id="_history_simplification">History Simplification</h3>
</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>
@@ -1421,9 +1422,9 @@ <h3 id="_history_simplification">History Simplification</h3>
</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">
@@ -1432,7 +1433,7 @@ <h3 id="_history_simplification">History Simplification</h3>
<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
@@ -1449,7 +1450,7 @@ <h3 id="_history_simplification">History Simplification</h3>
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>
@@ -1481,7 +1482,7 @@ <h3 id="_history_simplification">History Simplification</h3>
<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
@@ -1494,7 +1495,7 @@ <h3 id="_history_simplification">History Simplification</h3>
\ / / / /
`-------------'</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>
@@ -1519,7 +1520,7 @@ <h3 id="_history_simplification">History Simplification</h3>
<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>
@@ -1529,7 +1530,7 @@ <h3 id="_history_simplification">History Simplification</h3>
<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>
@@ -1559,7 +1560,7 @@ <h3 id="_history_simplification">History Simplification</h3>
</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
@@ -1568,7 +1569,7 @@ <h3 id="_history_simplification">History Simplification</h3>
\ / /
`---------'</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>
@@ -1603,9 +1604,9 @@ <h3 id="_history_simplification">History Simplification</h3>
<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">
@@ -1619,13 +1620,13 @@ <h3 id="_history_simplification">History Simplification</h3>
<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">
@@ -1637,7 +1638,7 @@ <h3 id="_history_simplification">History Simplification</h3>
</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
@@ -1653,15 +1654,13 @@ <h3 id="_bisection_helpers">Bisection Helpers</h3>
</dt>
<dd>
<p>
-Limit output to the one commit object which is roughly halfway between
-included and excluded commits. Note that the bad bisection ref
-<code>refs/bisect/bad</code> is added to the included commits (if it
-exists) and the good bisection refs <code>refs/bisect/good-*</code> are
-added to the excluded commits (if they exist). Thus, supposing there
-are no refs in <code>refs/bisect/</code>, if
+ Limit output to the one commit object which is roughly halfway between
+ included and excluded commits. Note that the bad bisection ref
+ <code>refs/bisect/bad</code> is added to the included commits (if it
+ exists) and the good bisection refs <code>refs/bisect/good-*</code> are
+ added to the excluded commits (if they exist). Thus, supposing there
+ are no refs in <code>refs/bisect/</code>, if
</p>
-</dd>
-</dl></div>
<div class="listingblock">
<div class="content">
<pre><code> $ git rev-list --bisect foo ^bar ^baz</code></pre>
@@ -1676,22 +1675,22 @@ <h3 id="_bisection_helpers">Bisection Helpers</h3>
introduces a regression is thus reduced to a binary search: repeatedly
generate and test new 'midpoint&#8217;s until the commit chain is of length
one.</p></div>
-<div class="dlist"><dl>
+</dd>
<dt class="hdlist1">
--bisect-vars
</dt>
<dd>
<p>
-This calculates the same as <code>--bisect</code>, except that refs in
-<code>refs/bisect/</code> are not used, and except that this outputs
-text ready to be eval&#8217;ed by the shell. These lines will assign the
-name of the midpoint revision to the variable <code>bisect_rev</code>, and the
-expected number of commits to be tested after <code>bisect_rev</code> is tested
-to <code>bisect_nr</code>, the expected number of commits to be tested if
-<code>bisect_rev</code> turns out to be good to <code>bisect_good</code>, the expected
-number of commits to be tested if <code>bisect_rev</code> turns out to be bad to
-<code>bisect_bad</code>, and the number of commits we are bisecting right now to
-<code>bisect_all</code>.
+ This calculates the same as <code>--bisect</code>, except that refs in
+ <code>refs/bisect/</code> are not used, and except that this outputs
+ text ready to be eval&#8217;ed by the shell. These lines will assign the
+ name of the midpoint revision to the variable <code>bisect_rev</code>, and the
+ expected number of commits to be tested after <code>bisect_rev</code> is tested
+ to <code>bisect_nr</code>, the expected number of commits to be tested if
+ <code>bisect_rev</code> turns out to be good to <code>bisect_good</code>, the expected
+ number of commits to be tested if <code>bisect_rev</code> turns out to be bad to
+ <code>bisect_bad</code>, and the number of commits we are bisecting right now to
+ <code>bisect_all</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1699,11 +1698,11 @@ <h3 id="_bisection_helpers">Bisection Helpers</h3>
</dt>
<dd>
<p>
-This outputs all the commit objects between the included and excluded
-commits, ordered by their distance to the included and excluded
-commits. Refs in <code>refs/bisect/</code> are not used. The farthest
-from them is displayed first. (This is the only one displayed by
-<code>--bisect</code>.)
+ This outputs all the commit objects between the included and excluded
+ commits, ordered by their distance to the included and excluded
+ commits. Refs in <code>refs/bisect/</code> are not used. The farthest
+ from them is displayed first. (This is the only one displayed by
+ <code>--bisect</code>.)
</p>
<div class="paragraph"><p>This is useful because it makes it easy to choose a good commit to
test when you want to avoid to test some of them for some reason (they
@@ -1766,7 +1765,7 @@ <h3 id="_commit_ordering">Commit Ordering</h3>
<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>
@@ -1781,9 +1780,9 @@ <h3 id="_object_traversal">Object Traversal</h3>
<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">
@@ -1791,9 +1790,9 @@ <h3 id="_object_traversal">Object Traversal</h3>
</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>
@@ -1803,7 +1802,7 @@ <h3 id="_object_traversal">Object Traversal</h3>
</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>
@@ -1814,9 +1813,9 @@ <h3 id="_object_traversal">Object Traversal</h3>
<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>
@@ -1825,7 +1824,7 @@ <h3 id="_object_traversal">Object Traversal</h3>
</dt>
<dd>
<p>
- Overrides a previous --no-walk.
+ Overrides a previous <code>--no-walk</code>.
</p>
</dd>
</dl></div>
@@ -1966,16 +1965,16 @@ <h3 id="_commit_formatting">Commit Formatting</h3>
<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>
@@ -2058,8 +2057,8 @@ <h3 id="_commit_formatting">Commit Formatting</h3>
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>
<dt class="hdlist1">
--count
@@ -2068,9 +2067,9 @@ <h3 id="_commit_formatting">Commit Formatting</h3>
<p>
Print a number stating how many commits would have been
listed, and suppress all other output. When used together
- with <em>--left-right</em>, instead print the counts for left and
+ with <code>--left-right</code>, instead print the counts for left and
right commits, separated by a tab. When used together with
- <em>--cherry-mark</em>, omit patch equivalent commits from these
+ <code>--cherry-mark</code>, omit patch equivalent commits from these
counts and print the count for equivalent commits separated
by a tab.
</p>
View
3  git.txt
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.8.5/git.html[documentation for release 1.8.5]
+* link:v1.8.5.1/git.html[documentation for release 1.8.5.1]
* release notes for
+ link:RelNotes/1.8.5.1.txt[1.8.5.1],
link:RelNotes/1.8.5.txt[1.8.5].
* link:v1.8.4.5/git.html[documentation for release 1.8.4.5]
View
12 gitcli.html
@@ -848,12 +848,12 @@ <h2 id="_description">DESCRIPTION</h2>
</li>
<li>
<p>
-many commands allow a long option "--option" to be abbreviated
+many commands allow a long option <code>--option</code> to be abbreviated
only to their unique prefix (e.g. if there is no other option
- whose name begins with "opt", you may be able to spell "--opt" to
- invoke the "--option" flag), but you should fully spell them out
+ whose name begins with <code>opt</code>, you may be able to spell <code>--opt</code> to
+ invoke the <code>--option</code> flag), but you should fully spell them out
when writing your scripts; later versions of Git may introduce a
- new option whose name shares the same prefix, e.g. "--optimize",
+ new option whose name shares the same prefix, e.g. <code>--optimize</code>,
to make a short prefix that used to be unique no longer unique.
</p>
</li>
@@ -924,7 +924,7 @@ <h3 id="_abbreviating_long_options">Abbreviating long options</h3>
with a caution. For example, <code>git commit --amen</code> behaves as if you
typed <code>git commit --amend</code>, but that is true only until a later version
of Git introduces another option that shares the same prefix,
-e.g `git commit --amenity" option.</p></div>
+e.g. <code>git commit --amenity</code> option.</p></div>
</div>
<div class="sect2">
<h3 id="_separating_argument_from_the_option">Separating argument from the option</h3>
@@ -1001,7 +1001,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-10-23 14:56:14 PDT
+Last updated 2013-12-03 14:06:33 PST
</div>
</div>
</body>
View
10 gitcli.txt
@@ -83,12 +83,12 @@ scripting Git:
`git log -1 HEAD` but write `git log -1 HEAD --`; the former will not work
if you happen to have a file called `HEAD` in the work tree.
- * many commands allow a long option "--option" to be abbreviated
+ * many commands allow a long option `--option` to be abbreviated
only to their unique prefix (e.g. if there is no other option
- whose name begins with "opt", you may be able to spell "--opt" to
- invoke the "--option" flag), but you should fully spell them out
+ whose name begins with `opt`, you may be able to spell `--opt` to
+ invoke the `--option` flag), but you should fully spell them out
when writing your scripts; later versions of Git may introduce a
- new option whose name shares the same prefix, e.g. "--optimize",
+ new option whose name shares the same prefix, e.g. `--optimize`,
to make a short prefix that used to be unique no longer unique.
@@ -149,7 +149,7 @@ prefix of a long option as if it is fully spelled out, but use this
with a caution. For example, `git commit --amen` behaves as if you
typed `git commit --amend`, but that is true only until a later version
of Git introduces another option that shares the same prefix,
-e.g `git commit --amenity" option.
+e.g. `git commit --amenity` option.
Separating argument from the option
View
6 gitglossary.html
@@ -1366,15 +1366,15 @@ <h2 id="_description">DESCRIPTION</h2>
<p>
A leading "<code>**</code>" followed by a slash means match in all
directories. For example, "<code>**/foo</code>" matches file or directory
- "<code>foo</code>" anywhere, the same as pattern "<code>foo</code>". "**/foo/bar"
+ "<code>foo</code>" anywhere, the same as pattern "<code>foo</code>". "<code>**/foo/bar</code>"
matches file or directory "<code>bar</code>" anywhere that is directly
under directory "<code>foo</code>".
</p>
</li>
<li>
<p>
-A trailing "/<strong>" matches everything inside. For example,
- "abc/</strong>" matches all files inside directory "abc", relative
+A trailing "<code>/**</code>" matches everything inside. For example,
+ "<code>abc/**</code>" matches all files inside directory "abc", relative
to the location of the <code>.gitignore</code> file, with infinite depth.
</p>
</li>
View
6 glossary-content.txt
@@ -362,12 +362,12 @@ full pathname may have special meaning:
- A leading "`**`" followed by a slash means match in all
directories. For example, "`**/foo`" matches file or directory
- "`foo`" anywhere, the same as pattern "`foo`". "**/foo/bar"
+ "`foo`" anywhere, the same as pattern "`foo`". "`**/foo/bar`"
matches file or directory "`bar`" anywhere that is directly
under directory "`foo`".
- - A trailing "/**" matches everything inside. For example,
- "abc/**" matches all files inside directory "abc", relative
+ - A trailing "`/**`" matches everything inside. For example,
+ "`abc/**`" matches all files inside directory "abc", relative
to the location of the `.gitignore` file, with infinite depth.
- A slash followed by two consecutive asterisks then a slash
View
243 rev-list-options.txt
@@ -18,33 +18,27 @@ ordering and formatting options, such as `--reverse`.
-<number>::
-n <number>::
--max-count=<number>::
-
Limit the number of commits to output.
--skip=<number>::
-
Skip 'number' commits before starting to show the commit output.
--since=<date>::
--after=<date>::
-
Show commits more recent than a specific date.
--until=<date>::
--before=<date>::
-
Show commits older than a specific date.
ifdef::git-rev-list[]
--max-age=<timestamp>::
--min-age=<timestamp>::
-
Limit the commits output to specified time range.
endif::git-rev-list[]
--author=<pattern>::
--committer=<pattern>::
-
Limit the commits output to ones with author/committer
header lines that match the specified pattern (regular
expression). With more than one `--author=<pattern>`,
@@ -52,7 +46,6 @@ endif::git-rev-list[]
chosen (similarly for multiple `--committer=<pattern>`).
--grep-reflog=<pattern>::
-
Limit the commits output to ones with reflog entries that
match the specified pattern (regular expression). With
more than one `--grep-reflog`, commits whose reflog message
@@ -60,7 +53,6 @@ endif::git-rev-list[]
error to use this option unless `--walk-reflogs` is in use.
--grep=<pattern>::
-
Limit the commits output to ones with log message that
matches the specified pattern (regular expression). With
more than one `--grep=<pattern>`, commits whose message
@@ -71,46 +63,39 @@ When `--show-notes` is in effect, the message from the notes as
if it is part of the log message.
--all-match::
- Limit the commits output to ones that match all given --grep,
+ Limit the commits output to ones that match all given `--grep`,
instead of ones that match at least one.
-i::
--regexp-ignore-case::
-
- Match the regexp limiting patterns without regard to letters case.
+ Match the regular expression limiting patterns without regard to letter
+ case.
--basic-regexp::
-
Consider the limiting patterns to be basic regular expressions;
this is the default.
-E::
--extended-regexp::
-
Consider the limiting patterns to be extended regular expressions
instead of the default basic regular expressions.
-F::
--fixed-strings::
-
Consider the limiting patterns to be fixed strings (don't interpret
pattern as a regular expression).
--perl-regexp::
-
- 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.
--remove-empty::
-
Stop when a given path disappears from the tree.
--merges::
-
Print only merge commits. This is exactly the same as `--min-parents=2`.
--no-merges::
-
Do not print commits with more than one parent. This is
exactly the same as `--max-parents=1`.
@@ -118,7 +103,6 @@ if it is part of the log message.
--max-parents=<number>::
--no-min-parents::
--no-max-parents::
-
Show only commits which have at least (or at most) that many parent
commits. In particular, `--max-parents=1` is the same as `--no-merges`,
`--min-parents=2` is the same as `--merges`. `--max-parents=0`
@@ -138,31 +122,26 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit).
brought in to your history by such a merge.
--not::
-
Reverses the meaning of the '{caret}' prefix (or lack thereof)
- for all following revision specifiers, up to the next '--not'.
+ for all following revision specifiers, up to the next `--not`.
--all::
-
Pretend as if all the refs in `refs/` are listed on the
command line as '<commit>'.
--branches[=<pattern>]::
-
Pretend as if all the refs in `refs/heads` are listed
on the command line as '<commit>'. If '<pattern>' is given, limit
branches to ones matching given shell glob. If pattern lacks '?',
'{asterisk}', or '[', '/{asterisk}' at the end is implied.
--tags[=<pattern>]::
-
Pretend as if all the refs in `refs/tags` are listed
on the command line as '<commit>'. If '<pattern>' is given, limit
tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}',
or '[', '/{asterisk}' at the end is implied.
--remotes[=<pattern>]::
-
Pretend as if all the refs in `refs/remotes` are listed
on the command line as '<commit>'. If '<pattern>' is given, limit
remote-tracking branches to ones matching given shell glob.
@@ -175,13 +154,11 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit).
or '[', '/{asterisk}' at the end is implied.
--ignore-missing::
-
Upon seeing an invalid object name in the input, pretend as if
the bad input was not given.
ifndef::git-rev-list[]
--bisect::
-
Pretend as if the bad bisection ref `refs/bisect/bad`
was listed and as if it was followed by `--not` and the good
bisection refs `refs/bisect/good-*` on the command
@@ -189,7 +166,6 @@ ifndef::git-rev-list[]
endif::git-rev-list[]
--stdin::
-
In addition to the '<commit>' listed on the command
line, read them from the standard input. If a '--' separator is
seen, stop reading commits and start reading paths to limit the
@@ -197,36 +173,32 @@ endif::git-rev-list[]
ifdef::git-rev-list[]
--quiet::
-
Don't print anything to standard output. This form
is primarily meant to allow the caller to
test the exit status to see if a range of objects is fully
connected (or not). It is faster than redirecting stdout
- to /dev/null as the output does not have to be formatted.
+ to `/dev/null` as the output does not have to be formatted.
endif::git-rev-list[]
--cherry-mark::
-
Like `--cherry-pick` (see below) but mark equivalent commits
with `=` rather than omitting them, and inequivalent ones with `+`.
--cherry-pick::
-
Omit any commit that introduces the same change as
- another commit on the "other side" when the set of
+ another commit on the ``other side'' when the set of
commits are limited with symmetric difference.
+
For example, if you have two branches, `A` and `B`, a usual way
to list all commits on only one side of them is with
`--left-right` (see the example below in the description of
-the `--left-right` 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 `--left-right` option). However, it 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
excluded from the output.
--left-only::
--right-only::
-
List only commits on the respective side of a symmetric range,
i.e. only those which would be marked `<` resp. `>` by
`--left-right`.
@@ -238,7 +210,6 @@ More precisely, `--cherry-pick --right-only --no-merges` gives the exact
list.
--cherry::
-
A synonym for `--right-only --cherry-mark --no-merges`; useful to
limit the output to the commits on our side and mark those that
have been applied to the other side of a forked history with
@@ -247,30 +218,27 @@ list.
-g::
--walk-reflogs::
-
Instead of walking the commit ancestry chain, walk
reflog entries from the most recent one to older ones.
When this option is used you cannot specify commits to
exclude (that is, '{caret}commit', 'commit1..commit2',
nor 'commit1\...commit2' notations cannot be used).
+
-With '\--pretty' format other than oneline (for obvious reasons),
+With `--pretty` format other than `oneline` (for obvious reasons),
this causes the output to have two extra lines of information
taken from the reflog. By default, 'commit@\{Nth}' notation is
used in the output. When the starting commit is specified as
'commit@\{now}', output also uses 'commit@\{timestamp}' notation
-instead. Under '\--pretty=oneline', the commit message is
+instead. Under `--pretty=oneline`, the commit message is
prefixed with this information on the same line.
-This option cannot be combined with '\--reverse'.
+This option cannot be combined with `--reverse`.
See also linkgit:git-reflog[1].
--merge::
-
After a failed merge, show refs that touch files having a
conflict and don't exist on all heads to merge.
--boundary::
-
Output excluded boundary commits. Boundary commits are
prefixed with `-`.
@@ -287,11 +255,9 @@ is how to do it, as there are various strategies to simplify the history.
The following options select the commits to be shown:
<paths>::
-
Commits modifying the given <paths> are selected.
--simplify-by-decoration::
-
Commits that are referred by some branch or tag are selected.
Note that extra commits can be shown to give a meaningful history.
@@ -299,33 +265,27 @@ Note that extra commits can be shown to give a meaningful history.
The following options affect the way the simplification is performed:
Default mode::
-
Simplifies the history to the simplest history explaining the
final state of the tree. Simplest because it prunes some side
branches if the end result is the same (i.e. merging branches
with the same content)
--full-history::
-
Same as the default mode, but does not prune some history.
--dense::
-
Only the selected commits are shown, plus some to have a
meaningful history.
--sparse::
-
All commits in the simplified history are shown.
--simplify-merges::
-
- Additional option to '--full-history' to remove some needless
+ Additional option to `--full-history` to remove some needless
merges from the resulting history, as there are no selected
commits contributing to this merge.
--ancestry-path::
-
When given a range of commits to display (e.g. 'commit1..commit2'
or 'commit2 {caret}commit1'), only display commits that exist
directly on the ancestry chain between the 'commit1' and
@@ -352,36 +312,35 @@ The horizontal line of history A---Q is taken to be the first parent of
each merge. The commits are:
* `I` is the initial commit, in which `foo` exists with contents
- "asdf", and a file `quux` exists with contents "quux". Initial
+ ``asdf'', and a file `quux` exists with contents ``quux''. Initial
commits are compared to an empty tree, so `I` is !TREESAME.
-* In `A`, `foo` contains just "foo".
+* In `A`, `foo` contains just ``foo''.
* `B` contains the same change as `A`. Its merge `M` is trivial and
hence TREESAME to all parents.
-* `C` does not change `foo`, but its merge `N` changes it to "foobar",
+* `C` does not change `foo`, but its merge `N` changes it to ``foobar'',
so it is not TREESAME to any parent.
-* `D` sets `foo` to "baz". Its merge `O` combines the strings from
- `N` and `D` to "foobarbaz"; i.e., it is not TREESAME to any parent.
+* `D` sets `foo` to ``baz''. Its merge `O` combines the strings from
+ `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent.
-* `E` changes `quux` to "xyzzy", and its merge `P` combines the
- strings to "quux xyzzy". `P` is TREESAME to `O`, but not to `E`.
+* `E` changes `quux` to ``xyzzy'', and its merge `P` combines the
+ strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`.
* `X` is an independent root commit that added a new file `side`, and `Y`
modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and
`Q` is TREESAME to `P`, but not to `Y`.
-'rev-list' walks backwards through history, including or excluding
-commits based on whether '\--full-history' and/or parent rewriting
-(via '\--parents' or '\--children') are used. The following settings
+`rev-list` walks backwards through history, including or excluding
+commits based on whether `--full-history` and/or parent rewriting
+(via `--parents` or `--children`) are used. The following settings
are available.
Default mode::
-
Commits are included if they are not TREESAME to any parent
- (though this can be changed, see '\--sparse' below). If the
+ (though this can be changed, see `--sparse` 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
@@ -400,12 +359,11 @@ available, removed `B` from consideration entirely. `C` was
considered via `N`, but is TREESAME. Root commits are compared to an
empty tree, so `I` is !TREESAME.
+
-Parent/child relations are only visible with --parents, but that does
+Parent/child relations are only visible with `--parents`, but that does
not affect the commits selected in default mode, so we have shown the
parent lines.
--full-history without parent rewriting::
-
This mode differs from the default in one point: always follow
all parents of a merge, even if it is TREESAME to one of them.
Even if more than one side of the merge has commits that are
@@ -425,9 +383,8 @@ about the parent/child relationships between the commits, so we show
them disconnected.
--full-history with parent rewriting::
-
Ordinary commits are only included if they are !TREESAME
- (though this can be changed, see '\--sparse' below).
+ (though this can be changed, see `--sparse` below).
+
Merges are always included. However, their parent list is rewritten:
Along each parent, prune away commits that are not included
@@ -441,7 +398,7 @@ themselves. This results in
`-------------'
-----------------------------------------------------------------------
+
-Compare to '\--full-history' without rewriting above. Note that `E`
+Compare to `--full-history` without rewriting above. Note that `E`
was pruned away because it is TREESAME, but the parent list of P was
rewritten to contain `E`'s parent `I`. The same happened for `C` and
`N`, and `X`, `Y` and `Q`.
@@ -450,22 +407,19 @@ In addition to the above settings, you can change whether TREESAME
affects inclusion:
--dense::
-
Commits that are walked are included if they are not TREESAME
to any parent.
--sparse::
-
All commits that are walked are included.
+
-Note that without '\--full-history', this still simplifies merges: if
+Note that without `--full-history`, 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.
--simplify-merges::
-
First, build a history graph in the same way that
- '\--full-history' with parent rewriting does (see above).
+ `--full-history` with parent rewriting does (see above).
+
Then simplify each commit `C` to its replacement `C'` in the final
history according to the following rules:
@@ -484,7 +438,7 @@ history according to the following rules:
--
+
The effect of this is best shown by way of comparing to
-'\--full-history' with parent rewriting. The example turns into:
+`--full-history` with parent rewriting. The example turns into:
+
-----------------------------------------------------------------------
.-A---M---N---O
@@ -494,7 +448,7 @@ The effect of this is best shown by way of comparing to
`---------'
-----------------------------------------------------------------------
+
-Note the major differences in `N`, `P` and `Q` over '--full-history':
+Note the major differences in `N`, `P`, and `Q` over `--full-history`:
+
--
* `N`'s parent list had `I` removed, because it is an ancestor of the
@@ -511,11 +465,10 @@ Note the major differences in `N`, `P` and `Q` over '--full-history':
Finally, there is a fifth simplification mode available:
--ancestry-path::
-
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 ``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.
+
As an example use case, consider the following commit history:
+
@@ -530,14 +483,14 @@ As an example use case, consider the following commit history:
A regular 'D..M' computes the set of commits that are ancestors of `M`,
but excludes the ones that are ancestors of `D`. This is useful to see
what happened to the history leading to `M` since `D`, in the sense
-that "what does `M` have that did not exist in `D`". The result in this
+that ``what does `M` have that did not exist in `D`''. The result in this
example would be all the commits, except `A` and `B` (and `D` itself,
of course).
+
When we want to find out what commits in `M` are contaminated with the
bug introduced by `D` and need fixing, however, we might want to view
only the subset of 'D..M' that are actually descendants of `D`, i.e.
-excluding `C` and `K`. This is exactly what the '--ancestry-path'
+excluding `C` and `K`. This is exactly what the `--ancestry-path`
option does. Applied to the 'D..M' range, it results in:
+
-----------------------------------------------------------------------
@@ -548,7 +501,7 @@ option does. Applied to the 'D..M' range, it results in:
L--M
-----------------------------------------------------------------------
-The '\--simplify-by-decoration' option allows you to view only the
+The `--simplify-by-decoration` 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
@@ -561,50 +514,47 @@ Bisection Helpers
~~~~~~~~~~~~~~~~~
--bisect::
-
-Limit output to the one commit object which is roughly halfway between
-included and excluded commits. Note that the bad bisection ref
-`refs/bisect/bad` is added to the included commits (if it
-exists) and the good bisection refs `refs/bisect/good-*` are
-added to the excluded commits (if they exist). Thus, supposing there
-are no refs in `refs/bisect/`, if
-
+ Limit output to the one commit object which is roughly halfway between
+ included and excluded commits. Note that the bad bisection ref
+ `refs/bisect/bad` is added to the included commits (if it
+ exists) and the good bisection refs `refs/bisect/good-*` are
+ added to the excluded commits (if they exist). Thus, supposing there
+ are no refs in `refs/bisect/`, if
++
-----------------------------------------------------------------------
$ git rev-list --bisect foo ^bar ^baz
-----------------------------------------------------------------------
-
++
outputs 'midpoint', the output of the two commands
-
++
-----------------------------------------------------------------------
$ git rev-list foo ^midpoint
$ git rev-list midpoint ^bar ^baz
-----------------------------------------------------------------------
-
++
would be of roughly the same length. Finding the change which
introduces a regression is thus reduced to a binary search: repeatedly
generate and test new 'midpoint's until the commit chain is of length
one.
--bisect-vars::
-
-This calculates the same as `--bisect`, except that refs in
-`refs/bisect/` are not used, and except that this outputs
-text ready to be eval'ed by the shell. These lines will assign the
-name of the midpoint revision to the variable `bisect_rev`, and the
-expected number of commits to be tested after `bisect_rev` is tested
-to `bisect_nr`, the expected number of commits to be tested if
-`bisect_rev` turns out to be good to `bisect_good`, the expected
-number of commits to be tested if `bisect_rev` turns out to be bad to
-`bisect_bad`, and the number of commits we are bisecting right now to
-`bisect_all`.
+ This calculates the same as `--bisect`, except that refs in
+ `refs/bisect/` are not used, and except that this outputs
+ text ready to be eval'ed by the shell. These lines will assign the
+ name of the midpoint revision to the variable `bisect_rev`, and the
+ expected number of commits to be tested after `bisect_rev` is tested
+ to `bisect_nr`, the expected number of commits to be tested if
+ `bisect_rev` turns out to be good to `bisect_good`, the expected
+ number of commits to be tested if `bisect_rev` turns out to be bad to
+ `bisect_bad`, and the number of commits we are bisecting right now to
+ `bisect_all`.
--bisect-all::
-
-This outputs all the commit objects between the included and excluded
-commits, ordered by their distance to the included and excluded
-commits. Refs in `refs/bisect/` are not used. The farthest
-from them is displayed first. (This is the only one displayed by
-`--bisect`.)
+ This outputs all the commit objects between the included and excluded
+ commits, ordered by their distance to the included and excluded
+ commits. Refs in `refs/bisect/` are not used. The farthest
+ from them is displayed first. (This is the only one displayed by
+ `--bisect`.)
+
This is useful because it makes it easy to choose a good commit to
test when you want to avoid to test some of them for some reason (they
@@ -654,9 +604,8 @@ avoid showing the commits from two parallel development track mixed
together.
--reverse::
-
Output the commits in reverse order.
- Cannot be combined with '\--walk-reflogs'.
+ Cannot be combined with `--walk-reflogs`.
Object Traversal
~~~~~~~~~~~~~~~~
@@ -664,37 +613,32 @@ Object Traversal
These options are mostly targeted for packing of Git repositories.
--objects::
-
Print the object IDs of any object referenced by the listed
- commits. '--objects foo ^bar' thus means "send me
+ commits. `--objects foo ^bar` thus means ``send me
all object IDs which I need to download if I have the commit
- object 'bar', but not 'foo'".
+ object _bar_ but not _foo_''.
--objects-edge::
-
- Similar to '--objects', but also print the IDs of excluded
- commits prefixed with a "-" character. This is used by
- linkgit:git-pack-objects[1] to build "thin" pack, which records
+ Similar to `--objects`, but also print the IDs of excluded
+ commits prefixed with a ``-'' character. This is used by
+ linkgit:git-pack-objects[1] to build ``thin'' pack, which records
objects in deltified form based on objects contained in these
excluded commits to reduce network traffic.
--unpacked::
-
- Only useful with '--objects'; print the object IDs that are not
+ Only useful with `--objects`; print the object IDs that are not
in packs.
--no-walk[=(sorted|unsorted)]::
-
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
+ `unsorted` is given, the commits are shown in the order they were
+ given on the command line. Otherwise (if `sorted` or no argument
+ was given), the commits are shown in reverse chronological order
by commit time.