<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>Everyday GIT With 20 Commands Or So</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p><a href="#Basic Repository">[Basic Repository]</a> commands are needed by people who have a\r
+<
div class="para"><p><a href="#Basic Repository">[Basic Repository]</a> commands are needed by people who have a
\r repository --- that is everybody, because every working tree of\r
-git is a repository.</p>\r
-<p>In addition, <a href="#Individual Developer (Standalone)">[Individual Developer (Standalone)]</a> commands are\r
+git is a repository.</p></div>\r
+<
div class="para"><p>In addition, <a href="#Individual Developer (Standalone)">[Individual Developer (Standalone)]</a> commands are
\r essential for anybody who makes a commit, even for somebody who\r
-works alone.</p>\r
-<p>If you work with other people, you will need commands listed in\r
-the <a href="#Individual Developer (Participant)">[Individual Developer (Participant)]</a> section as well.</p>\r
-<p>People who play the <a href="#Integrator">[Integrator]</a> role need to learn some more\r
-commands in addition to the above.</p>\r
-<p><a href="#Repository Administration">[Repository Administration]</a> commands are for system\r
+works alone.</p></div>\r
+<div class="para"><p>If you work with other people, you will need commands listed in\r
+the <a href="#Individual Developer (Participant)">[Individual Developer (Participant)]</a> section as well.</p></div>\r
+<
div class="para"><p>People who play the <a href="#Integrator">[Integrator]</a> role need to learn some more
\r+commands in addition to the above.</p></div>\r
+<
div class="para"><p><a href="#Repository Administration">[Repository Administration]</a> commands are for system
\r administrators who are responsible for the care and feeding\r
-of git repositories.</p>\r
+of git repositories.</p></div>\r
</div>\r
</div>\r
-<h2>Basic Repository<a id="Basic Repository"></a></h2>\r
+<h2
id="_basic_repository_a_id_basic_repository_a">Basic Repository<a id="Basic Repository"></a></h2>
\r <div class="sectionbody">\r
-<p>Everybody uses these commands to maintain git repositories.</p>\r
-<ul>\r
+<div class="para"><p>Everybody uses these commands to maintain git repositories.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<a href="git-init.html">git-init(1)</a> or <a href="git-clone.html">git-clone(1)</a> to create a\r
repack and prune.\r
</p>\r
</li>\r
-</ul>\r
-<h3>Examples</h3>\r
-<dl>\r
+</ul></div>\r
+<h3 id="_examples">Examples</h3><div style="clear:left"></div>\r
+<div class="vlist"><dl>\r
<dt>\r
Check health and remove cruft.\r
</dt>\r
$ git count-objects <b>(2)</b>\r
$ git gc <b>(3)</b></tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
running without <tt>--full</tt> is usually cheap and assures the\r
repacks the local repository and performs other housekeeping tasks.\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</dd>\r
<dt>\r
Repack a small project into single pack.\r
<div class="content">\r
<pre><tt>$ git gc <b>(1)</b></tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
pack all the objects reachable from the refs into one pack,\r
then remove the other packs.\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Individual Developer (Standalone)<a id="Individual Developer (Standalone)"></a></h2>\r
+<h2
id="_individual_developer_standalone_a_id_individual_developer_standalone_a">Individual Developer (Standalone)<a id="Individual Developer (Standalone)"></a></h2>
\r <div class="sectionbody">\r
-<p>A standalone individual developer does not exchange patches with\r
+<div class="para"><p>A standalone individual developer does not exchange patches with\r
other people, and works alone in a single repository, using the\r
-following commands.</p>\r
-<ul>\r
+following commands.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<a href="git-show-branch.html">git-show-branch(1)</a> to see where you are.\r
<a href="git-tag.html">git-tag(1)</a> to mark known point.\r
</p>\r
</li>\r
-</ul>\r
-<h3>Examples</h3>\r
-<dl>\r
+</ul></div>\r
+<h3 id="_examples_2">Examples</h3><div style="clear:left"></div>\r
+<div class="vlist"><dl>\r
<dt>\r
Use a tarball as a starting point for a new repository.\r
</dt>\r
$ git commit -m "import of frotz source tree."\r
$ git tag v2.43 <b>(2)</b></tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
add everything under the current directory.\r
make a lightweight, unannotated tag.\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</dd>\r
<dt>\r
Create a topic branch and develop.\r
$ git log --since='3 days ago' <b>(11)</b>\r
$ git log v2.43.. curses/ <b>(12)</b></tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
create a new topic branch.\r
directory, since <tt>v2.43</tt> tag.\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Individual Developer (Participant)<a id="Individual Developer (Participant)"></a></h2>\r
+<h2
id="_individual_developer_participant_a_id_individual_developer_participant_a">Individual Developer (Participant)<a id="Individual Developer (Participant)"></a></h2>
\r <div class="sectionbody">\r
-<p>A developer working as a participant in a group project needs to\r
+<div class="para"><p>A developer working as a participant in a group project needs to\r
learn how to communicate with others, and uses these commands in\r
-addition to the ones needed by a standalone developer.</p>\r
-<ul>\r
+addition to the ones needed by a standalone developer.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<a href="git-clone.html">git-clone(1)</a> from the upstream to prime your local\r
you adopt Linux kernel-style public forum workflow.\r
</p>\r
</li>\r
-</ul>\r
-<h3>Examples</h3>\r
-<dl>\r
+</ul></div>\r
+<h3 id="_examples_3">Examples</h3><div style="clear:left"></div>\r
+<div class="vlist"><dl>\r
<dt>\r
Clone the upstream and work on it. Feed changes to upstream.\r
</dt>\r
$ git gc <b>(7)</b>\r
$ git fetch --tags <b>(8)</b></tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
repeat as needed.\r
and store them under <tt>.git/refs/tags/</tt>.\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</dd>\r
<dt>\r
Push into another repository.\r
mothership$ git checkout master\r
mothership$ git merge satellite/master <b>(5)</b></tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
mothership machine has a frotz repository under your home\r
machine into the master branch.\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</dd>\r
<dt>\r
Branch off of a specific tag.\r
$ git format-patch -k -m --stdout v2.6.14..private2.6.14 |\r
git am -3 -k <b>(2)</b></tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
create a private branch based on a well known (but somewhat behind)\r
without a formal "merging".\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Integrator<a id="Integrator"></a></h2>\r
+<h2
id="_integrator_a_id_integrator_a">Integrator<a id="Integrator"></a></h2>
\r <div class="sectionbody">\r
-<p>A fairly central person acting as the integrator in a group\r
+<div class="para"><p>A fairly central person acting as the integrator in a group\r
project receives changes made by others, reviews and integrates\r
them and publishes the result for others to use, using these\r
-commands in addition to the ones needed by participants.</p>\r
-<ul>\r
+commands in addition to the ones needed by participants.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<a href="git-am.html">git-am(1)</a> to apply patches e-mailed in from your\r
<a href="git-push.html">git-push(1)</a> to publish the bleeding edge.\r
</p>\r
</li>\r
-</ul>\r
-<h3>Examples</h3>\r
-<dl>\r
+</ul></div>\r
+<h3 id="_examples_4">Examples</h3><div style="clear:left"></div>\r
+<div class="vlist"><dl>\r
<dt>\r
My typical GIT day.\r
</dt>\r
$ git push ko <b>(12)</b>\r
$ git push ko v0.99.9x <b>(13)</b></tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
see what I was in the middle of doing, if any.\r
Push: +pu\r
Push: maint</tt></pre>\r
</div></div>\r
-<p>In the output from <tt>git show-branch</tt>, <tt>master</tt> should have\r
+<div class="para"><p>In the output from <tt>git show-branch</tt>, <tt>master</tt> should have\r
everything <tt>ko-master</tt> has, and <tt>next</tt> should have\r
-everything <tt>ko-next</tt> has.</p>\r
+everything <tt>ko-next</tt> has.</p></div>\r
</li>\r
<li>\r
<p>\r
push the tag out, too.\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Repository Administration<a id="Repository Administration"></a></h2>\r
+<h2
id="_repository_administration_a_id_repository_administration_a">Repository Administration<a id="Repository Administration"></a></h2>
\r <div class="sectionbody">\r
-<p>A repository administrator uses the following tools to set up\r
-and maintain access to the repository by developers.</p>\r
-<ul>\r
+<div class="para"><p>A repository administrator uses the following tools to set up\r
+and maintain access to the repository by developers.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<a href="git-daemon.html">git-daemon(1)</a> to allow anonymous download from\r
for shared central repository users.\r
</p>\r
</li>\r
-</ul>\r
-<p><a href="howto/update-hook-example.txt">update hook howto</a> has a good\r
-example of managing a shared central repository.</p>\r
-<h3>Examples</h3>\r
-<dl>\r
+</ul></div>\r
+<
div class="para"><p><a href="howto/update-hook-example.txt">update hook howto</a> has a good
\r+example of managing a shared central repository.</p></div>\r
+<h3 id="_examples_5">Examples</h3><div style="clear:left"></div>\r
+<div class="vlist"><dl>\r
<dt>\r
We assume the following in /etc/services\r
</dt>\r
git stream tcp nowait nobody \\r
/usr/bin/git-daemon git-daemon --inetd --export-all /pub/scm</tt></pre>\r
</div></div>\r
-<p>The actual configuration line should be on one line.</p>\r
+<div class="para"><p>The actual configuration line should be on one line.</p></div>\r
</dd>\r
<dt>\r
Run git-daemon to serve /pub/scm from xinetd.\r
log_on_failure += USERID\r
}</tt></pre>\r
</div></div>\r
-<p>Check your xinetd(8) documentation and setup, this is from a Fedora system.\r
-Others might be different.</p>\r
+<div class="para"><p>Check your xinetd(8) documentation and setup, this is from a Fedora system.\r
+Others might be different.</p></div>\r
</dd>\r
<dt>\r
Give push/pull only access to developers.\r
$ grep git /etc/shells <b>(2)</b>\r
/usr/bin/git-shell</tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
log-in shell is set to /usr/bin/git-shell, which does not\r
as the login shell.\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</dd>\r
<dt>\r
CVS-style shared repository.\r
refs/heads/doc-update bob\r
refs/tags/v[0-9]* david</tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
place the developers into the same git group.\r
create and push version tags.\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</dd>\r
<dt>\r
HTTP server to support dumb protocol transfer.\r
dev$ ftp user@isp.example.com <b>(2)</b>\r
ftp> cp -r .git /home/user/myproject.git</tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
make sure your info/refs and objects/info/packs are up-to-date\r
upload to public HTTP server hosted by your ISP.\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:14 UTC\r
+Last updated 2008-09-19 06:33:25 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-21 04:33:30 UTC\r
+Last updated 2008-09-19 06:32:41 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-16 10:22:58 UTC\r
+Last updated 2008-09-19 06:32:41 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-07 06:05:36 UTC\r
+Last updated 2008-09-19 06:32:41 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-10 02:30:35 UTC\r
+Last updated 2008-09-19 06:32:41 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:35 UTC\r
+Last updated 2008-09-19 06:32:42 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:35 UTC\r
+Last updated 2008-09-19 06:32:42 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:35 UTC\r
+Last updated 2008-09-19 06:32:42 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:03 UTC\r
+Last updated 2008-09-19 06:32:42 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:04 UTC\r
+Last updated 2008-09-19 06:32:43 UTC\r
</div>\r
</div>\r
</body>\r
<div class="sectionbody">\r
<div class="para"><p><em>git-bundle</em> will only package references that are shown by\r
<em>git-show-ref</em>: this includes heads, tags, and remote heads. References\r
-such as master<sub>1 cannot be packaged, but are perfectly suitable for\r
+such as master~1 cannot be packaged, but are perfectly suitable for\r
defining the basis. More than one reference may be packaged, and more\r
than one basis can be specified. The objects packaged are those not\r
contained in the union of the given bases. Each basis can be\r
-specified explicitly (e.g., ^master</sub>10), or implicitly (e.g.,\r
+specified explicitly (e.g., ^master~10), or implicitly (e.g.,\r
master~10..master, master --since=10.days.ago).</p></div>\r
<div class="para"><p>It is very important that the basis used be held by the destination.\r
It is okay to err on the side of conservatism, causing the bundle file\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:36 UTC\r
+Last updated 2008-09-19 06:32:43 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-06 06:19:08 UTC\r
+Last updated 2008-09-19 06:32:43 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:04 UTC\r
+Last updated 2008-09-19 06:32:44 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:37 UTC\r
+Last updated 2008-09-19 06:32:44 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:37 UTC\r
+Last updated 2008-09-19 06:32:44 UTC\r
</div>\r
</div>\r
</body>\r
<pre><tt>$ git checkout -m mytopic\r
Auto-merging frotz</tt></pre>\r
</div></div>\r
-<div class="para"><p>After this three-way merge, the local modifications are <em>not</em>\r
+<div class="para"><p>After this three-way merge, the local modifications are _not_\r
registered in your index file, so <tt>git diff</tt> would show you what\r
changes you made since the tip of the new branch.</p></div>\r
</li>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-24 03:33:55 UTC\r
+Last updated 2008-09-19 06:32:44 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:05 UTC\r
+Last updated 2008-09-19 06:32:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:05 UTC\r
+Last updated 2008-09-19 06:32:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:38 UTC\r
+Last updated 2008-09-19 06:32:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-31 22:10:18 UTC\r
+Last updated 2008-09-19 06:32:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-03 07:58:01 UTC\r
+Last updated 2008-09-19 06:32:46 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-04 00:23:35 UTC\r
+Last updated 2008-09-19 06:32:46 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-04 00:23:35 UTC\r
+Last updated 2008-09-19 06:32:46 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-19 06:26:30 UTC\r
+Last updated 2008-09-19 06:32:46 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-21 10:34:00 UTC\r
+Last updated 2008-09-19 06:32:47 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:40 UTC\r
+Last updated 2008-09-19 06:32:47 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:40 UTC\r
+Last updated 2008-09-19 06:32:48 UTC\r
</div>\r
</div>\r
</body>\r
automatically saving it in your <em>CVS/Root</em> files, then you need to set them\r
explicitly in your environment. CVSROOT should be set as per normal, but the\r
directory should point at the appropriate git repo. As above, for SSH clients\r
- <em>not</em> restricted to <em>git-shell</em>, CVS_SERVER should be set to <em>git-cvsserver</em>.\r
+ _not_ restricted to <em>git-shell</em>, CVS_SERVER should be set to <em>git-cvsserver</em>.\r
</p>\r
<div class="listingblock">\r
<div class="content">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-19 09:01:25 UTC\r
+Last updated 2008-09-19 06:32:48 UTC\r
</div>\r
</div>\r
</body>\r
</dt>\r
<dd>\r
<p>\r
- Allow <sub>user notation to be used in requests. When\r
+ Allow ~user notation to be used in requests. When\r
specified with no parameter, requests to\r
- git://host/</sub>alice/foo is taken as a request to access\r
+ git://host/~alice/foo is taken as a request to access\r
<em>foo</em> repository in the home directory of user <tt>alice</tt>.\r
If <tt>--user-path=path</tt> is specified, the same request is\r
taken as a request to access <tt>path/foo</tt> repository in\r
<dd>\r
<p>\r
This serves <em>git-send-pack</em> clients, allowing anonymous\r
- push. It is disabled by default, as there is <em>no</em>\r
+ push. It is disabled by default, as there is _no_\r
authentication in the protocol (in other words, anybody\r
can push anything into the repository, including removal\r
of refs). This is solely meant for a closed LAN setting\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-31 06:31:47 UTC\r
+Last updated 2008-09-19 06:32:49 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-31 22:10:18 UTC\r
+Last updated 2008-09-19 06:32:49 UTC\r
</div>\r
</div>\r
</body>\r
</div></div>\r
<div class="para"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is\r
involved. Especially, even for a creation or a deletion,\r
-<tt>/dev/null</tt> is <em>not</em> used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>\r
+<tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>\r
<div class="para"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the\r
name of the source file of the rename/copy and the name of\r
the file that rename/copy produces, respectively.</p></div>\r
added, from the point of view of that parent).</p></div>\r
<div class="para"><p>In the above example output, the function signature was changed\r
from both files (hence two <tt>-</tt> removals from both file1 and\r
-file2, plus <tt><tt>+</tt> to mean one line that was added does not appear\r
+file2, plus <tt>++</tt> to mean one line that was added does not appear\r
in either file1 nor file2). Also two other lines are the same\r
-from file1 but do not appear in file2 (hence prefixed with <tt> </tt></tt>).</p></div>\r
+from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p></div>\r
<div class="para"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a\r
merge commit with the merge result (i.e. file1..fileN are the\r
parents). When shown by <tt>git diff-files -c</tt>, it compares the\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-03 05:19:53 UTC\r
+Last updated 2008-09-19 06:32:50 UTC\r
</div>\r
</div>\r
</body>\r
</div></div>\r
<div class="para"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is\r
involved. Especially, even for a creation or a deletion,\r
-<tt>/dev/null</tt> is <em>not</em> used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>\r
+<tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>\r
<div class="para"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the\r
name of the source file of the rename/copy and the name of\r
the file that rename/copy produces, respectively.</p></div>\r
added, from the point of view of that parent).</p></div>\r
<div class="para"><p>In the above example output, the function signature was changed\r
from both files (hence two <tt>-</tt> removals from both file1 and\r
-file2, plus <tt><tt>+</tt> to mean one line that was added does not appear\r
+file2, plus <tt>++</tt> to mean one line that was added does not appear\r
in either file1 nor file2). Also two other lines are the same\r
-from file1 but do not appear in file2 (hence prefixed with <tt> </tt></tt>).</p></div>\r
+from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p></div>\r
<div class="para"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a\r
merge commit with the merge result (i.e. file1..fileN are the\r
parents). When shown by <tt>git diff-files -c</tt>, it compares the\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-03 05:19:54 UTC\r
+Last updated 2008-09-19 06:32:50 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-19 06:26:30 UTC\r
+Last updated 2008-09-19 06:32:51 UTC\r
</div>\r
</div>\r
</body>\r
<p>\r
This form is to view the changes you made relative to\r
the index (staging area for the next commit). In other\r
- words, the differences are what you <em>could</em> tell git to\r
+ words, the differences are what you _could_ tell git to\r
further add to the index but you still haven't. You can\r
stage these changes by using <a href="git-add.html">git-add(1)</a>.\r
</p>\r
<tree-ish>.</p></div>\r
<div class="para"><p>For a more complete list of ways to spell <commit>, see\r
"SPECIFYING REVISIONS" section in <a href="git-rev-parse.html">git-rev-parse(1)</a>.\r
-However, "diff" is about comparing two <em>endpoints</em>, not ranges,\r
+However, "diff" is about comparing two _endpoints_, not ranges,\r
and the range notations ("<commit>..<commit>" and\r
"<commit>...<commit>") do not mean a range as defined in the\r
"SPECIFYING RANGES" section in <a href="git-rev-parse.html">git-rev-parse(1)</a>.</p></div>\r
</div></div>\r
<div class="para"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is\r
involved. Especially, even for a creation or a deletion,\r
-<tt>/dev/null</tt> is <em>not</em> used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>\r
+<tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>\r
<div class="para"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the\r
name of the source file of the rename/copy and the name of\r
the file that rename/copy produces, respectively.</p></div>\r
added, from the point of view of that parent).</p></div>\r
<div class="para"><p>In the above example output, the function signature was changed\r
from both files (hence two <tt>-</tt> removals from both file1 and\r
-file2, plus <tt><tt>+</tt> to mean one line that was added does not appear\r
+file2, plus <tt>++</tt> to mean one line that was added does not appear\r
in either file1 nor file2). Also two other lines are the same\r
-from file1 but do not appear in file2 (hence prefixed with <tt> </tt></tt>).</p></div>\r
+from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p></div>\r
<div class="para"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a\r
merge commit with the merge result (i.e. file1..fileN are the\r
parents). When shown by <tt>git diff-files -c</tt>, it compares the\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-03 05:19:56 UTC\r
+Last updated 2008-09-19 06:32:51 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-30 18:31:05 UTC\r
+Last updated 2008-09-19 06:32:52 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-20 01:23:33 UTC\r
+Last updated 2008-09-19 06:32:53 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:46 UTC\r
+Last updated 2008-09-19 06:32:53 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-10 03:55:18 UTC\r
+Last updated 2008-09-19 06:32:53 UTC\r
</div>\r
</div>\r
</body>\r
a perl rewrite on all files) or information about each commit.\r
Otherwise, all information (including original commit times or merge\r
information) will be preserved.</p></div>\r
-<div class="para"><p>The command will only rewrite the <em>positive</em> refs mentioned in the\r
+<div class="para"><p>The command will only rewrite the _positive_ refs mentioned in the\r
command line (e.g. if you pass <em>a..b</em>, only <em>b</em> will be rewritten).\r
If you specify no filters, the commits will be recommitted without any\r
changes, which would normally have no effect. Nevertheless, this may be\r
will print.</p></div>\r
<div class="para"><p><strong>NOTE</strong> the changes introduced by the commits, and which are not reverted\r
by subsequent commits, will still be in the rewritten branch. If you want\r
-to throw out <em>changes</em> together with the commits, you should use the\r
+to throw out _changes_ together with the commits, you should use the\r
interactive mode of <em>git-rebase</em>.</p></div>\r
<div class="para"><p>Consider this history:</p></div>\r
<div class="listingblock">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-10 03:55:19 UTC\r
+Last updated 2008-09-19 06:32:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:09 UTC\r
+Last updated 2008-09-19 06:32:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-19 06:26:32 UTC\r
+Last updated 2008-09-19 06:32:55 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-03 05:19:57 UTC\r
+Last updated 2008-09-19 06:32:55 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-fsck-objects(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git fsck-objects</em> …</p>\r
+<div class="para"><p><em>git fsck-objects</em> …</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>This is a synonym for <a href="git-fsck.html">git-fsck(1)</a>. Please refer to the\r
-documentation of that command.</p>\r
+<
div class="para"><p>This is a synonym for <a href="git-fsck.html">git-fsck(1)</a>. Please refer to the
\r+documentation of that command.</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:46 UTC\r
+Last updated 2008-09-19 06:32:55 UTC\r
</div>\r
</div>\r
</body>\r
<div class="content">\r
<pre><tt>git fsck --unreachable HEAD $(cat .git/refs/heads/*)</tt></pre>\r
</div></div>\r
-<div class="para"><p>will do quite a <em>lot</em> of verification on the tree. There are a few\r
+<div class="para"><p>will do quite a _lot_ of verification on the tree. There are a few\r
extra validity tests to be added (make sure that tree objects are\r
sorted properly etc), but on the whole if <em>git-fsck</em> is happy, you\r
do have a valid tree.</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:48 UTC\r
+Last updated 2008-09-19 06:32:56 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:49 UTC\r
+Last updated 2008-09-19 06:32:56 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:49 UTC\r
+Last updated 2008-09-19 06:32:56 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:49 UTC\r
+Last updated 2008-09-19 06:32:56 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:49 UTC\r
+Last updated 2008-09-19 06:32:57 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-20 09:13:32 UTC\r
+Last updated 2008-09-19 06:32:57 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-03 05:19:57 UTC\r
+Last updated 2008-09-19 06:32:57 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:50 UTC\r
+Last updated 2008-09-19 06:32:57 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-http-push(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git http-push</em> [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>…]</p>\r
+<div class="para"><p><em>git http-push</em> [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>…]</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Sends missing objects to remote repository, and updates the\r
-remote branch.</p>\r
-<p><strong>NOTE</strong>: This command is temporarily disabled if your libcurl\r
+<div class="para"><p>Sends missing objects to remote repository, and updates the\r
+remote branch.</p></div>\r
+<div class="para"><p><strong>NOTE</strong>: This command is temporarily disabled if your libcurl\r
is older than 7.16, as the combination has been reported\r
-not to work and sometimes corrupts repository.</p>\r
+not to work and sometimes corrupts repository.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
--all\r
</dt>\r
cannot be the remote HEAD. If -d is specified the following\r
other conditions must also be met:\r
</p>\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
Remote HEAD must resolve to an object that exists locally\r
Specified branch is an ancestor of the remote HEAD\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</dd>\r
<dt>\r
<ref>…\r
The remote refs to update.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Specifying the Refs</h2>\r
+<h2 id="_specifying_the_refs">Specifying the Refs</h2>\r
<div class="sectionbody">\r
-<p>A <em><ref></em> specification can be either a single pattern, or a pair\r
+<div class="para"><p>A <em><ref></em> specification can be either a single pattern, or a pair\r
of such patterns separated by a colon ":" (this means that a ref name\r
cannot have a colon in it). A single pattern <em><name></em> is just a\r
-shorthand for <em><name>:<name></em>.</p>\r
-<p>Each pattern pair consists of the source side (before the colon)\r
+shorthand for <em><name>:<name></em>.</p></div>\r
+<div class="para"><p>Each pattern pair consists of the source side (before the colon)\r
and the destination side (after the colon). The ref to be\r
pushed is determined by finding a match that matches the source\r
side, and where it is pushed is determined by using the\r
-destination side.</p>\r
-<ul>\r
+destination side.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
It is an error if <src> does not match exactly one of the\r
<p>\r
If <dst> does not match any remote ref, either\r
</p>\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
it has to start with "refs/"; <dst> is used as the\r
locally is used as the name of the destination.\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</li>\r
-</ul>\r
-<p>Without <em>--force</em>, the <src> ref is stored at the remote only if\r
+</ul></div>\r
+<div class="para"><p>Without <em>--force</em>, the <src> ref is stored at the remote only if\r
<dst> does not exist, or <dst> is a proper subset (i.e. an\r
ancestor) of <src>. This check, known as "fast forward check",\r
is performed in order to avoid accidentally overwriting the\r
-remote ref and lose other peoples' commits from there.</p>\r
-<p>With <em>--force</em>, the fast forward check is disabled for all refs.</p>\r
-<p>Optionally, a <ref> parameter can be prefixed with a plus <em>+</em> sign\r
-to disable the fast-forward check only on that ref.</p>\r
+remote ref and lose other peoples' commits from there.</p></div>\r
+<div class="para"><p>With <em>--force</em>, the fast forward check is disabled for all refs.</p></div>\r
+<div class="para"><p>Optionally, a <ref> parameter can be prefixed with a plus <em>+</em> sign\r
+to disable the fast-forward check only on that ref.</p></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Nick Hengeveld <nickh@reactrix.com></p>\r
+<div class="para"><p>Written by Nick Hengeveld <nickh@reactrix.com></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by Nick Hengeveld</p>\r
+<div class="para"><p>Documentation by Nick Hengeveld</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:49 UTC\r
+Last updated 2008-09-19 06:32:58 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-20 09:13:32 UTC\r
+Last updated 2008-09-19 06:32:58 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:51 UTC\r
+Last updated 2008-09-19 06:32:58 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-init-db(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git init-db</em> [-q | --quiet] [--template=<template_directory>] [--shared[=<permissions>]]</p>\r
+<div class="para"><p><em>git init-db</em> [-q | --quiet] [--template=<template_directory>] [--shared[=<permissions>]]</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>This is a synonym for <a href="git-init.html">git-init(1)</a>. Please refer to the\r
-documentation of that command.</p>\r
+<
div class="para"><p>This is a synonym for <a href="git-init.html">git-init(1)</a>. Please refer to the
\r+documentation of that command.</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:49 UTC\r
+Last updated 2008-09-19 06:32:58 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:51 UTC\r
+Last updated 2008-09-19 06:32:59 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:51 UTC\r
+Last updated 2008-09-19 06:32:59 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-19 06:26:32 UTC\r
+Last updated 2008-09-19 06:32:59 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-lost-found(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git lost-found</em></p>\r
+<div class="para"><p><em>git lost-found</em></p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p><strong>NOTE</strong>: this command is deprecated. Use <a href="git-fsck.html">git-fsck(1)</a> with\r
-the option <em>--lost-found</em> instead.</p>\r
-<p>Finds dangling commits and tags from the object database, and\r
+<
div class="para"><p><strong>NOTE</strong>: this command is deprecated. Use <a href="git-fsck.html">git-fsck(1)</a> with
\r+the option <em>--lost-found</em> instead.</p></div>\r
+<div class="para"><p>Finds dangling commits and tags from the object database, and\r
creates refs to them in the .git/lost-found/ directory. Commits and\r
tags that dereference to commits are stored in .git/lost-found/commit,\r
-and other objects are stored in .git/lost-found/other.</p>\r
+and other objects are stored in .git/lost-found/other.</p></div>\r
</div>\r
-<h2>OUTPUT</h2>\r
+<h2 id="_output">OUTPUT</h2>\r
<div class="sectionbody">\r
-<p>Prints to standard output the object names and one-line descriptions\r
-of any commits or tags found.</p>\r
+<div class="para"><p>Prints to standard output the object names and one-line descriptions\r
+of any commits or tags found.</p></div>\r
</div>\r
-<h2>EXAMPLE</h2>\r
+<h2 id="_example">EXAMPLE</h2>\r
<div class="sectionbody">\r
-<p>Suppose you run <em>git tag -f</em> and mistype the tag to overwrite.\r
+<div class="para"><p>Suppose you run <em>git tag -f</em> and mistype the tag to overwrite.\r
The ref to your tag is overwritten, but until you run <em>git\r
-prune</em>, the tag itself is still there.</p>\r
+prune</em>, the tag itself is still there.</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ git lost-found\r
[1ef2b196d909eed523d4f3c9bf54b78cdd6843c6] GIT 0.99.9c\r
...</tt></pre>\r
</div></div>\r
-<p>Also you can use gitk to browse how any tags found relate to each\r
-other.</p>\r
+<div class="para"><p>Also you can use gitk to browse how any tags found relate to each\r
+other.</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ gitk $(cd .git/lost-found/commit && echo ??*)</tt></pre>\r
</div></div>\r
-<p>After making sure you know which the object is the tag you are looking\r
-for, you can reconnect it to your regular .git/refs hierarchy.</p>\r
+<div class="para"><p>After making sure you know which the object is the tag you are looking\r
+for, you can reconnect it to your regular .git/refs hierarchy.</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ git cat-file -t 1ef2b196\r
1ef2b196d909eed523d4f3c9bf54b78cdd6843c6</tt></pre>\r
</div></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Junio C Hamano <gitster@pobox.com></p>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>\r
+<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:50 UTC\r
+Last updated 2008-09-19 06:32:59 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-29 08:16:52 UTC\r
+Last updated 2008-09-19 06:33:00 UTC\r
</div>\r
</div>\r
</body>\r
<dd>\r
<p>\r
Limit to only refs/heads and refs/tags, respectively.\r
- These options are <em>not</em> mutually exclusive; when given\r
+ These options are _not_ mutually exclusive; when given\r
both, references stored in refs/heads and refs/tags are\r
displayed.\r
</p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:11 UTC\r
+Last updated 2008-09-19 06:33:00 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-29 08:16:53 UTC\r
+Last updated 2008-09-19 06:33:01 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:11 UTC\r
+Last updated 2008-09-19 06:33:01 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:12 UTC\r
+Last updated 2008-09-19 06:33:01 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-21 10:34:00 UTC\r
+Last updated 2008-09-19 06:33:02 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:53 UTC\r
+Last updated 2008-09-19 06:33:02 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:53 UTC\r
+Last updated 2008-09-19 06:33:02 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:12 UTC\r
+Last updated 2008-09-19 06:33:02 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-merge-tree(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git merge-tree</em> <base-tree> <branch1> <branch2></p>\r
+<div class="para"><p><em>git merge-tree</em> <base-tree> <branch1> <branch2></p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Reads three treeish, and output trivial merge results and\r
+<div class="para"><p>Reads three treeish, and output trivial merge results and\r
conflicting stages to the standard output. This is similar to\r
what three-way read-tree -m does, but instead of storing the\r
results in the index, the command outputs the entries to the\r
-standard output.</p>\r
-<p>This is meant to be used by higher level scripts to compute\r
+standard output.</p></div>\r
+<div class="para"><p>This is meant to be used by higher level scripts to compute\r
merge results outside index, and stuff the results back into the\r
index. For this reason, the output from the command omits\r
-entries that match <branch1> tree.</p>\r
+entries that match <branch1> tree.</p></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Linus Torvalds <torvalds@osdl.org></p>\r
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>\r
+<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:53 UTC\r
+Last updated 2008-09-19 06:33:02 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-13 06:06:56 UTC\r
+Last updated 2008-09-19 06:33:03 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-06 06:19:09 UTC\r
+Last updated 2008-09-19 06:33:02 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-mktag(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git mktag</em> < signature_file</p>\r
+<div class="para"><p><em>git mktag</em> < signature_file</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Reads a tag contents on standard input and creates a tag object\r
-that can also be used to sign other objects.</p>\r
-<p>The output is the new tag's <object> identifier.</p>\r
+<div class="para"><p>Reads a tag contents on standard input and creates a tag object\r
+that can also be used to sign other objects.</p></div>\r
+<div class="para"><p>The output is the new tag's <object> identifier.</p></div>\r
</div>\r
-<h2>Tag Format</h2>\r
+<h2 id="_tag_format">Tag Format</h2>\r
<div class="sectionbody">\r
-<p>A tag signature file has a very simple fixed format: four lines of</p>\r
+<div class="para"><p>A tag signature file has a very simple fixed format: four lines of</p></div>\r
<div class="literalblock">\r
<div class="content">\r
<pre><tt>object <sha1>\r
tag <tagname>\r
tagger <tagger></tt></pre>\r
</div></div>\r
-<p>followed by some <em>optional</em> free-form message (some tags created\r
+<div class="para"><p>followed by some <em>optional</em> free-form message (some tags created\r
by older git may not have <tt>tagger</tt> line). The message, when\r
exists, is separated by a blank line from the header. The\r
message part may contain a signature that git itself doesn't\r
-care about, but that can be verified with gpg.</p>\r
+care about, but that can be verified with gpg.</p></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Linus Torvalds <torvalds@osdl.org></p>\r
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p>\r
+<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:54 UTC\r
+Last updated 2008-09-19 06:33:03 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:13 UTC\r
+Last updated 2008-09-19 06:33:03 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-mv(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git mv</em> <options>… <args>…</p>\r
+<div class="para"><p><em>git mv</em> <options>… <args>…</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>This script is used to move or rename a file, directory or symlink.</p>\r
+<div class="para"><p>This script is used to move or rename a file, directory or symlink.</p></div>\r
<div class="literalblock">\r
<div class="content">\r
<pre><tt>git mv [-f] [-n] <source> <destination>\r
git mv [-f] [-n] [-k] <source> ... <destination directory></tt></pre>\r
</div></div>\r
-<p>In the first form, it renames <source>, which must exist and be either\r
+<div class="para"><p>In the first form, it renames <source>, which must exist and be either\r
a file, symlink or directory, to <destination>.\r
In the second form, the last argument has to be an existing\r
-directory; the given sources will be moved into this directory.</p>\r
-<p>The index is updated after successful completion, but the change must still be\r
-committed.</p>\r
+directory; the given sources will be moved into this directory.</p></div>\r
+<div class="para"><p>The index is updated after successful completion, but the change must still be\r
+committed.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
-f\r
</dt>\r
Do nothing; only show what would happen\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Linus Torvalds <torvalds@osdl.org>\r
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>\r
Rewritten by Ryan Anderson <ryan@michonline.com>\r
-Move functionality added by Josef Weidendorfer <Josef.Weidendorfer@gmx.de></p>\r
+Move functionality added by Josef Weidendorfer <Josef.Weidendorfer@gmx.de></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p>\r
+<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:54 UTC\r
+Last updated 2008-09-19 06:33:04 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-31 06:31:47 UTC\r
+Last updated 2008-09-19 06:33:04 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:55 UTC\r
+Last updated 2008-09-19 06:33:04 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:55 UTC\r
+Last updated 2008-09-19 06:33:04 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-pack-refs(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git pack-refs</em> [--all] [--no-prune]</p>\r
+<div class="para"><p><em>git pack-refs</em> [--all] [--no-prune]</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Traditionally, tips of branches and tags (collectively known as\r
+<div class="para"><p>Traditionally, tips of branches and tags (collectively known as\r
<em>refs</em>) were stored one file per ref under <tt>$GIT_DIR/refs</tt>\r
directory. While many branch tips tend to be updated often,\r
most tags and some branch tips are never updated. When a\r
repository has hundreds or thousands of tags, this\r
one-file-per-ref format both wastes storage and hurts\r
-performance.</p>\r
-<p>This command is used to solve the storage and performance\r
+performance.</p></div>\r
+<div class="para"><p>This command is used to solve the storage and performance\r
problem by stashing the refs in a single file,\r
<tt>$GIT_DIR/packed-refs</tt>. When a ref is missing from the\r
traditional <tt>$GIT_DIR/refs</tt> hierarchy, it is looked up in this\r
-file and used if found.</p>\r
-<p>Subsequent updates to branches always creates new file under\r
-<tt>$GIT_DIR/refs</tt> hierarchy.</p>\r
-<p>A recommended practice to deal with a repository with too many\r
+file and used if found.</p></div>\r
+<div class="para"><p>Subsequent updates to branches always creates new file under\r
+<tt>$GIT_DIR/refs</tt> hierarchy.</p></div>\r
+<div class="para"><p>A recommended practice to deal with a repository with too many\r
refs is to pack its refs with <tt>--all --prune</tt> once, and\r
occasionally run <tt>git pack-refs --prune</tt>. Tags are by\r
definition stationary and are not expected to change. Branch\r
heads will be packed with the initial <tt>pack-refs --all</tt>, but\r
only the currently active branch heads will become unpacked,\r
and next <tt>pack-refs</tt> (without <tt>--all</tt>) will leave them\r
-unpacked.</p>\r
+unpacked.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
--all\r
</dt>\r
hierarchy after packing them. This option tells it not to.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Linus Torvalds <torvalds@osdl.org></p>\r
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:55 UTC\r
+Last updated 2008-09-19 06:33:04 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:55 UTC\r
+Last updated 2008-09-19 06:33:05 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:56 UTC\r
+Last updated 2008-09-19 06:33:05 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:13 UTC\r
+Last updated 2008-09-19 06:33:05 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-prune-packed(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git prune-packed</em> [-n] [-q]</p>\r
+<div class="para"><p><em>git prune-packed</em> [-n] [-q]</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>This program searches the <tt>$GIT_OBJECT_DIR</tt> for all objects that currently\r
-exist in a pack file as well as the independent object directories.</p>\r
-<p>All such extra objects are removed.</p>\r
-<p>A pack is a collection of objects, individually compressed, with delta\r
-compression applied, stored in a single file, with an associated index file.</p>\r
-<p>Packs are used to reduce the load on mirror systems, backup engines,\r
-disk storage, etc.</p>\r
+<div class="para"><p>This program searches the <tt>$GIT_OBJECT_DIR</tt> for all objects that currently\r
+exist in a pack file as well as the independent object directories.</p></div>\r
+<div class="para"><p>All such extra objects are removed.</p></div>\r
+<div class="para"><p>A pack is a collection of objects, individually compressed, with delta\r
+compression applied, stored in a single file, with an associated index file.</p></div>\r
+<div class="para"><p>Packs are used to reduce the load on mirror systems, backup engines,\r
+disk storage, etc.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
-n\r
</dt>\r
Squelch the progress indicator.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Linus Torvalds <torvalds@osdl.org></p>\r
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by Ryan Anderson <ryan@michonline.com></p>\r
+<div class="para"><p>Documentation by Ryan Anderson <ryan@michonline.com></p></div>\r
</div>\r
-<h2>SEE ALSO</h2>\r
+<h2 id="_see_also">SEE ALSO</h2>\r
<div class="sectionbody">\r
-<p><a href="git-pack-objects.html">git-pack-objects(1)</a>\r
-<a href="git-repack.html">git-repack(1)</a></p>\r
+<
div class="para"><p><a href="git-pack-objects.html">git-pack-objects(1)</a>
\r+<a href="git-repack.html">git-repack(1)</a></p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:56 UTC\r
+Last updated 2008-09-19 06:33:05 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:56 UTC\r
+Last updated 2008-09-19 06:33:05 UTC\r
</div>\r
</div>\r
</body>\r
<td class="icon">\r
<div class="title">Note</div>\r
</td>\r
-<td class="content">This is a potentially <em>dangerous</em> mode of operation.\r
+<td class="content">This is a potentially _dangerous_ mode of operation.\r
It rewrites history, which does not bode well when you\r
published that history already. Do <strong>not</strong> use this option\r
unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-10 03:55:19 UTC\r
+Last updated 2008-09-19 06:33:06 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-10 03:55:20 UTC\r
+Last updated 2008-09-19 06:33:06 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-quiltimport(1)</title>\r
</head>\r
<div class="verseblock">\r
<div class="content"><em>git quiltimport</em> [--dry-run] [--author <author>] [--patches <dir>]</div></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Applies a quilt patchset onto the current git branch, preserving\r
+<div class="para"><p>Applies a quilt patchset onto the current git branch, preserving\r
the patch boundaries, patch order, and patch descriptions present\r
-in the quilt patchset.</p>\r
-<p>For each patch the code attempts to extract the author from the\r
+in the quilt patchset.</p></div>\r
+<div class="para"><p>For each patch the code attempts to extract the author from the\r
patch description. If that fails it falls back to the author\r
specified with --author. If the --author flag was not given\r
the patch description is displayed and the user is asked to\r
-interactively enter the author of the patch.</p>\r
-<p>If a subject is not found in the patch description the patch name is\r
-preserved as the 1 line subject in the git description.</p>\r
+interactively enter the author of the patch.</p></div>\r
+<div class="para"><p>If a subject is not found in the patch description the patch name is\r
+preserved as the 1 line subject in the git description.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
-n\r
</dt>\r
The directory to find the quilt patches and the\r
quilt series file.\r
</p>\r
-<p>The default for the patch directory is patches\r
+<div class="para"><p>The default for the patch directory is patches\r
or the value of the $QUILT_PATCHES environment\r
-variable.</p>\r
+variable.</p></div>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Eric Biederman <ebiederm@lnxi.com></p>\r
+<div class="para"><p>Written by Eric Biederman <ebiederm@lnxi.com></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by Eric Biederman <ebiederm@lnxi.com></p>\r
+<div class="para"><p>Documentation by Eric Biederman <ebiederm@lnxi.com></p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:57 UTC\r
+Last updated 2008-09-19 06:33:07 UTC\r
</div>\r
</div>\r
</body>\r
</li>\r
<li>\r
<p>\r
-a file that has <em>any</em> difference what-so-ever in the three trees\r
+a file that has _any_ difference what-so-ever in the three trees\r
will stay as separate entries in the index. It's up to "porcelain\r
policy" to determine how to remove the non-0 stages, and insert a\r
merged version.\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-16 19:17:16 UTC\r
+Last updated 2008-09-19 06:33:07 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:14 UTC\r
+Last updated 2008-09-19 06:33:07 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:58 UTC\r
+Last updated 2008-09-19 06:33:07 UTC\r
</div>\r
</div>\r
</body>\r
point to one week ago", and so on. See <a href="git-rev-parse.html">git-rev-parse(1)</a> for\r
more details.</p></div>\r
<div class="para"><p>To delete single entries from the reflog, use the subcommand "delete"\r
-and specify the <em>exact</em> entry (e.g. "<tt>git reflog delete master@{2}</tt>").</p></div>\r
+and specify the _exact_ entry (e.g. "<tt>git reflog delete master@{2}</tt>").</p></div>\r
</div>\r
<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:14 UTC\r
+Last updated 2008-09-19 06:33:08 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-relink(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git relink</em> [--safe] <dir> [<dir>]* <master_dir></p>\r
+<div class="para"><p><em>git relink</em> [--safe] <dir> [<dir>]* <master_dir></p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>This will scan 1 or more object repositories and look for objects in common\r
+<div class="para"><p>This will scan 1 or more object repositories and look for objects in common\r
with a master repository. Objects not already hardlinked to the master\r
-repository will be replaced with a hardlink to the master repository.</p>\r
+repository will be replaced with a hardlink to the master repository.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
--safe\r
</dt>\r
Directories containing a .git/objects/ subdirectory.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Ryan Anderson <ryan@michonline.com></p>\r
+<div class="para"><p>Written by Ryan Anderson <ryan@michonline.com></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>\r
+<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:58 UTC\r
+Last updated 2008-09-19 06:33:08 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:59 UTC\r
+Last updated 2008-09-19 06:33:08 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:59 UTC\r
+Last updated 2008-09-19 06:33:08 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-repo-config(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git repo-config</em> …</p>\r
+<div class="para"><p><em>git repo-config</em> …</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>This is a synonym for <a href="git-config.html">git-config(1)</a>. Please refer to the\r
-documentation of that command.</p>\r
+<
div class="para"><p>This is a synonym for <a href="git-config.html">git-config(1)</a>. Please refer to the
\r+documentation of that command.</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:59 UTC\r
+Last updated 2008-09-19 06:33:09 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:15 UTC\r
+Last updated 2008-09-19 06:33:09 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-10 03:55:20 UTC\r
+Last updated 2008-09-19 06:33:09 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:15 UTC\r
+Last updated 2008-09-19 06:33:09 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-19 06:26:33 UTC\r
+Last updated 2008-09-19 06:33:10 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-30 18:31:06 UTC\r
+Last updated 2008-09-19 06:33:10 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-21 00:27:25 UTC\r
+Last updated 2008-09-19 06:33:10 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-10 03:55:20 UTC\r
+Last updated 2008-09-19 06:33:11 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-01 06:10:53 UTC\r
+Last updated 2008-09-19 06:33:11 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:01 UTC\r
+Last updated 2008-09-19 06:33:11 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:03 UTC\r
+Last updated 2008-09-19 06:33:13 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:02 UTC\r
+Last updated 2008-09-19 06:33:12 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:02 UTC\r
+Last updated 2008-09-19 06:33:12 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:16 UTC\r
+Last updated 2008-09-19 06:33:12 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:02 UTC\r
+Last updated 2008-09-19 06:33:12 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-31 22:10:22 UTC\r
+Last updated 2008-09-19 06:33:13 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-19 06:26:34 UTC\r
+Last updated 2008-09-19 06:33:13 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-03 05:20:00 UTC\r
+Last updated 2008-09-19 06:33:13 UTC\r
</div>\r
</div>\r
</body>\r
current HEAD commit, paths that have differences between the working\r
tree and the index file, and paths in the working tree that are not\r
tracked by git (and are not ignored by <a href="gitignore.html">gitignore(5)</a>). The first\r
-are what you <em>would</em> commit by running <tt>git commit</tt>; the second and\r
-third are what you <em>could</em> commit by running <em>git-add</em> before running\r
+are what you _would_ commit by running <tt>git commit</tt>; the second and\r
+third are what you _could_ commit by running <em>git-add</em> before running\r
<tt>git commit</tt>.</p></div>\r
<div class="para"><p>The command takes the same set of options as <em>git-commit</em>; it\r
shows what would be committed if the same options are given to\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:17 UTC\r
+Last updated 2008-09-19 06:33:14 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-stripspace(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git stripspace</em> [-s | --strip-comments] < <stream></p>\r
+<div class="para"><p><em>git stripspace</em> [-s | --strip-comments] < <stream></p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Remove multiple empty lines, and empty lines at beginning and end.</p>\r
+<div class="para"><p>Remove multiple empty lines, and empty lines at beginning and end.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
-s\r
</dt>\r
Byte stream to act on.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Linus Torvalds <torvalds@osdl.org></p>\r
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>\r
+<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:04 UTC\r
+Last updated 2008-09-19 06:33:14 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-28 02:50:34 UTC\r
+Last updated 2008-09-19 06:33:14 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-10 03:55:21 UTC\r
+Last updated 2008-09-19 06:33:14 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:17 UTC\r
+Last updated 2008-09-19 06:33:15 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-26 06:45:38 UTC\r
+Last updated 2008-09-19 06:33:15 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:06 UTC\r
+Last updated 2008-09-19 06:33:16 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>A short git tools survey</title>\r
</head>\r
<div id="header">\r
<h1>A short git tools survey</h1>\r
</div>\r
-<h2>Introduction</h2>\r
+<h2 id="_introduction">Introduction</h2>\r
<div class="sectionbody">\r
-<p>Apart from git contrib/ area there are some others third-party tools\r
-you may want to look.</p>\r
-<p>This document presents a brief summary of each tool and the corresponding\r
-link.</p>\r
+<div class="para"><p>Apart from git contrib/ area there are some others third-party tools\r
+you may want to look.</p></div>\r
+<div class="para"><p>This document presents a brief summary of each tool and the corresponding\r
+link.</p></div>\r
</div>\r
-<h2>Alternative/Augmentative Porcelains</h2>\r
+<h2 id="_alternative_augmentative_porcelains">Alternative/Augmentative Porcelains</h2>\r
<div class="sectionbody">\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<strong>Cogito</strong> (http://www.kernel.org/pub/software/scm/cogito/)\r
until they get merged upstream.</tt></pre>\r
</div></div>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
-<h2>History Viewers</h2>\r
+<h2 id="_history_viewers">History Viewers</h2>\r
<div class="sectionbody">\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<strong>gitk</strong> (shipped with git-core)\r
use it as a pager for git commands.</tt></pre>\r
</div></div>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
-<h2>Foreign SCM interface</h2>\r
+<h2 id="_foreign_scm_interface">Foreign SCM interface</h2>\r
<div class="sectionbody">\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<strong>git-svn</strong> (shipped with git-core)\r
in sync with the master Mercurial repository.</tt></pre>\r
</div></div>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
-<h2>Others</h2>\r
+<h2 id="_others">Others</h2>\r
<div class="sectionbody">\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<strong>(h)gct</strong> (http://www.cyd.liu.se/users/~freku045/gct/)\r
tweaking to work on XEmacs.</tt></pre>\r
</div></div>\r
</li>\r
-</ul>\r
-<p>http://git.or.cz/gitwiki/InterfacesFrontendsAndTools has more\r
-comprehensive list.</p>\r
+</ul></div>\r
+<div class="para"><p>http://git.or.cz/gitwiki/InterfacesFrontendsAndTools has more\r
+comprehensive list.</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:15 UTC\r
+Last updated 2008-09-19 06:33:25 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-unpack-file(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git unpack-file</em> <blob></p>\r
+<div class="para"><p><em>git unpack-file</em> <blob></p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Creates a file holding the contents of the blob specified by sha1. It\r
+<div class="para"><p>Creates a file holding the contents of the blob specified by sha1. It\r
returns the name of the temporary file in the following format:\r
- .merge_file_XXXXX</p>\r
+ .merge_file_XXXXX</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
<blob>\r
</dt>\r
Must be a blob id\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Linus Torvalds <torvalds@osdl.org></p>\r
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p>\r
+<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:05 UTC\r
+Last updated 2008-09-19 06:33:16 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-unpack-objects(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git unpack-objects</em> [-n] [-q] [-r] [--strict] <pack-file</p>\r
+<div class="para"><p><em>git unpack-objects</em> [-n] [-q] [-r] [--strict] <pack-file</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Read a packed archive (.pack) from the standard input, expanding\r
+<div class="para"><p>Read a packed archive (.pack) from the standard input, expanding\r
the objects contained within and writing them into the repository in\r
-"loose" (one object per file) format.</p>\r
-<p>Objects that already exist in the repository will <strong>not</strong> be unpacked\r
+"loose" (one object per file) format.</p></div>\r
+<div class="para"><p>Objects that already exist in the repository will <strong>not</strong> be unpacked\r
from the pack-file. Therefore, nothing will be unpacked if you use\r
-this command on a pack-file that exists within the target repository.</p>\r
-<p>See <a href="git-repack.html">git-repack(1)</a> for options to generate\r
-new packs and replace existing ones.</p>\r
+this command on a pack-file that exists within the target repository.</p></div>\r
+<
div class="para"><p>See <a href="git-repack.html">git-repack(1)</a> for options to generate
\r+new packs and replace existing ones.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
-n\r
</dt>\r
Don't write objects with broken content or links.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Linus Torvalds <torvalds@osdl.org></p>\r
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by Junio C Hamano</p>\r
+<div class="para"><p>Documentation by Junio C Hamano</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:06 UTC\r
+Last updated 2008-09-19 06:33:16 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-29 08:16:53 UTC\r
+Last updated 2008-09-19 06:33:16 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-update-ref(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git update-ref</em> [-m <reason>] (-d <ref> [<oldvalue>] | [--no-deref] <ref> <newvalue> [<oldvalue>])</p>\r
+<div class="para"><p><em>git update-ref</em> [-m <reason>] (-d <ref> [<oldvalue>] | [--no-deref] <ref> <newvalue> [<oldvalue>])</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Given two arguments, stores the <newvalue> in the <ref>, possibly\r
+<div class="para"><p>Given two arguments, stores the <newvalue> in the <ref>, possibly\r
dereferencing the symbolic refs. E.g. <tt>git update-ref HEAD\r
-<newvalue></tt> updates the current branch head to the new object.</p>\r
-<p>Given three arguments, stores the <newvalue> in the <ref>,\r
+<newvalue></tt> updates the current branch head to the new object.</p></div>\r
+<div class="para"><p>Given three arguments, stores the <newvalue> in the <ref>,\r
possibly dereferencing the symbolic refs, after verifying that\r
the current value of the <ref> matches <oldvalue>.\r
E.g. <tt>git update-ref refs/heads/master <newvalue> <oldvalue></tt>\r
updates the master branch head to <newvalue> only if its current\r
value is <oldvalue>. You can specify 40 "0" or an empty string\r
as <oldvalue> to make sure that the ref you are creating does\r
-not exist.</p>\r
-<p>It also allows a "ref" file to be a symbolic pointer to another\r
+not exist.</p></div>\r
+<div class="para"><p>It also allows a "ref" file to be a symbolic pointer to another\r
ref file by starting with the four-byte header sequence of\r
-"ref:".</p>\r
-<p>More importantly, it allows the update of a ref file to follow\r
+"ref:".</p></div>\r
+<div class="para"><p>More importantly, it allows the update of a ref file to follow\r
these symbolic pointers, whether they are symlinks or these\r
"regular file symbolic refs". It follows <strong>real</strong> symlinks only\r
if they start with "refs/": otherwise it will just try to read\r
them and update them as a regular file (i.e. it will allow the\r
filesystem to follow them, but will overwrite such a symlink to\r
-somewhere else with a regular filename).</p>\r
-<p>If --no-deref is given, <ref> itself is overwritten, rather than\r
-the result of following the symbolic pointers.</p>\r
-<p>In general, using</p>\r
+somewhere else with a regular filename).</p></div>\r
+<div class="para"><p>If --no-deref is given, <ref> itself is overwritten, rather than\r
+the result of following the symbolic pointers.</p></div>\r
+<div class="para"><p>In general, using</p></div>\r
<div class="literalblock">\r
<div class="content">\r
<pre><tt>git update-ref HEAD "$head"</tt></pre>\r
</div></div>\r
-<p>should be a _lot_ safer than doing</p>\r
+<div class="para"><p>should be a _lot_ safer than doing</p></div>\r
<div class="literalblock">\r
<div class="content">\r
<pre><tt>echo "$head" > "$GIT_DIR/HEAD"</tt></pre>\r
</div></div>\r
-<p>both from a symlink following standpoint <strong>and</strong> an error checking\r
+<div class="para"><p>both from a symlink following standpoint <strong>and</strong> an error checking\r
standpoint. The "refs/" rule for symlinks means that symlinks\r
that point to "outside" the tree are safe: they'll be followed\r
for reading but not for writing (so we'll never write through a\r
ref symlink to some other tree, if you have copied a whole\r
-archive by creating a symlink tree).</p>\r
-<p>With <tt>-d</tt> flag, it deletes the named <ref> after verifying it\r
-still contains <oldvalue>.</p>\r
+archive by creating a symlink tree).</p></div>\r
+<div class="para"><p>With <tt>-d</tt> flag, it deletes the named <ref> after verifying it\r
+still contains <oldvalue>.</p></div>\r
</div>\r
-<h2>Logging Updates</h2>\r
+<h2 id="_logging_updates">Logging Updates</h2>\r
<div class="sectionbody">\r
-<p>If config parameter "core.logAllRefUpdates" is true or the file\r
+<div class="para"><p>If config parameter "core.logAllRefUpdates" is true or the file\r
"$GIT_DIR/logs/<ref>" exists then <tt>git update-ref</tt> will append\r
a line to the log file "$GIT_DIR/logs/<ref>" (dereferencing all\r
symbolic refs before creating the log name) describing the change\r
-in ref value. Log lines are formatted as:</p>\r
-<ol>\r
+in ref value. Log lines are formatted as:</p></div>\r
+<div class="olist"><ol>\r
<li>\r
<p>\r
oldsha1 SP newsha1 SP committer LF\r
</p>\r
-<p>Where "oldsha1" is the 40 character hexadecimal value previously\r
+<div class="para"><p>Where "oldsha1" is the 40 character hexadecimal value previously\r
stored in <ref>, "newsha1" is the 40 character hexadecimal value of\r
<newvalue> and "committer" is the committer's name, email address\r
-and date in the standard GIT committer ident format.</p>\r
+and date in the standard GIT committer ident format.</p></div>\r
</li>\r
-</ol>\r
-<p>Optionally with -m:</p>\r
-<ol>\r
+</ol></div>\r
+<div class="para"><p>Optionally with -m:</p></div>\r
+<div class="olist"><ol>\r
<li>\r
<p>\r
oldsha1 SP newsha1 SP committer TAB message LF\r
</p>\r
-<p>Where all fields are as described above and "message" is the\r
-value supplied to the -m option.</p>\r
+<div class="para"><p>Where all fields are as described above and "message" is the\r
+value supplied to the -m option.</p></div>\r
</li>\r
-</ol>\r
-<p>An update will fail (without changing <ref>) if the current user is\r
+</ol></div>\r
+<div class="para"><p>An update will fail (without changing <ref>) if the current user is\r
unable to create a new log file, append to the existing log file\r
-or does not have committer information available.</p>\r
+or does not have committer information available.</p></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Linus Torvalds <torvalds@osdl.org>.</p>\r
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:06 UTC\r
+Last updated 2008-09-19 06:33:16 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:18 UTC\r
+Last updated 2008-09-19 06:33:17 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:06 UTC\r
+Last updated 2008-09-19 06:33:17 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:06 UTC\r
+Last updated 2008-09-19 06:33:17 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-04 00:23:37 UTC\r
+Last updated 2008-09-19 06:33:17 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:18 UTC\r
+Last updated 2008-09-19 06:33:17 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-31 22:10:24 UTC\r
+Last updated 2008-09-19 06:33:18 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-13 06:06:56 UTC\r
+Last updated 2008-09-19 06:33:18 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-19 06:26:35 UTC\r
+Last updated 2008-09-19 06:33:18 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:08 UTC\r
+Last updated 2008-09-19 06:33:18 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-13 06:06:57 UTC\r
+Last updated 2008-09-19 06:33:19 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-19 06:26:35 UTC\r
+Last updated 2008-09-19 06:33:19 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>gitcli(7)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p>gitcli</p>\r
+<div class="para"><p>gitcli</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>This manual describes the convention used throughout git CLI.</p>\r
-<p>Many commands take revisions (most often "commits", but sometimes\r
+<div class="para"><p>This manual describes the convention used throughout git CLI.</p></div>\r
+<div class="para"><p>Many commands take revisions (most often "commits", but sometimes\r
"tree-ish", depending on the context and command) and paths as their\r
-arguments. Here are the rules:</p>\r
-<ul>\r
+arguments. Here are the rules:</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
Revisions come first and then paths.\r
disambiguate.\r
</p>\r
</li>\r
-</ul>\r
-<p>When writing a script that is expected to handle random user-input, it is\r
+</ul></div>\r
+<div class="para"><p>When writing a script that is expected to handle random user-input, it is\r
a good practice to make it explicit which arguments are which by placing\r
-disambiguating <tt>--</tt> at appropriate places.</p>\r
-<p>Here are the rules regarding the "flags" that you should follow when you are\r
-scripting git:</p>\r
-<ul>\r
+disambiguating <tt>--</tt> at appropriate places.</p></div>\r
+<div class="para"><p>Here are the rules regarding the "flags" that you should follow when you are\r
+scripting git:</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
it's preferred to use the non dashed form of git commands, which means that\r
if you happen to have a file called <tt>HEAD</tt> in the work tree.\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
-<h2>ENHANCED OPTION PARSER</h2>\r
+<h2 id="_enhanced_option_parser">ENHANCED OPTION PARSER</h2>\r
<div class="sectionbody">\r
-<p>From the git 1.5.4 series and further, many git commands (not all of them at the\r
-time of the writing though) come with an enhanced option parser.</p>\r
-<p>Here is an exhaustive list of the facilities provided by this option parser.</p>\r
-<h3>Magic Options</h3>\r
-<p>Commands which have the enhanced option parser activated all understand a\r
-couple of magic command line options:</p>\r
-<dl>\r
+<div class="para"><p>From the git 1.5.4 series and further, many git commands (not all of them at the\r
+time of the writing though) come with an enhanced option parser.</p></div>\r
+<div class="para"><p>Here is an exhaustive list of the facilities provided by this option parser.</p></div>\r
+<h3 id="_magic_options">Magic Options</h3><div style="clear:left"></div>\r
+<div class="para"><p>Commands which have the enhanced option parser activated all understand a\r
+couple of magic command line options:</p></div>\r
+<div class="vlist"><dl>\r
<dt>\r
-h\r
</dt>\r
option gives the full list of options.\r
</p>\r
</dd>\r
-</dl>\r
-<h3>Negating options</h3>\r
-<p>Options with long option names can be negated by prefixing <tt>"--no-"</tt>. For\r
+</dl></div>\r
+<h3 id="_negating_options">Negating options</h3><div style="clear:left"></div>\r
+<div class="para"><p>Options with long option names can be negated by prefixing <tt>"--no-"</tt>. For\r
example, <tt>"git branch"</tt> has the option <tt>"--track"</tt> which is <em>on</em> by default. You\r
can use <tt>"--no-track"</tt> to override that behaviour. The same goes for <tt>"--color"</tt>\r
-and <tt>"--no-color"</tt>.</p>\r
-<h3>Aggregating short options</h3>\r
-<p>Commands that support the enhanced option parser allow you to aggregate short\r
+and <tt>"--no-color"</tt>.</p></div>\r
+<h3 id="_aggregating_short_options">Aggregating short options</h3><div style="clear:left"></div>\r
+<div class="para"><p>Commands that support the enhanced option parser allow you to aggregate short\r
options. This means that you can for example use <tt>"git rm -rf"</tt> or\r
-<tt>"git clean -fdx"</tt>.</p>\r
-<h3>Separating argument from the option</h3>\r
-<p>You can write the mandatory option parameter to an option as a separate\r
-word on the command line. That means that all the following uses work:</p>\r
+<tt>"git clean -fdx"</tt>.</p></div>\r
+<h3 id="_separating_argument_from_the_option">Separating argument from the option</h3><div style="clear:left"></div>\r
+<div class="para"><p>You can write the mandatory option parameter to an option as a separate\r
+word on the command line. That means that all the following uses work:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ git foo --long-opt=Arg\r
$ git foo -oArg\r
$ git foo -o Arg</tt></pre>\r
</div></div>\r
-<p>However, this is <strong>NOT</strong> allowed for switches with an optional value, where the\r
-<em>sticked</em> form must be used:</p>\r
+<div class="para"><p>However, this is <strong>NOT</strong> allowed for switches with an optional value, where the\r
+<em>sticked</em> form must be used:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ git describe --abbrev HEAD # correct\r
$ git describe --abbrev 10 HEAD # NOT WHAT YOU MEANT</tt></pre>\r
</div></div>\r
</div>\r
-<h2>NOTES ON FREQUENTLY CONFUSED OPTIONS</h2>\r
+<h2 id="_notes_on_frequently_confused_options">NOTES ON FREQUENTLY CONFUSED OPTIONS</h2>\r
<div class="sectionbody">\r
-<p>Many commands that can work on files in the working tree\r
+<div class="para"><p>Many commands that can work on files in the working tree\r
and/or in the index can take <tt>--cached</tt> and/or <tt>--index</tt>\r
options. Sometimes people incorrectly think that, because\r
the index was originally called cache, these two are\r
synonyms. They are <strong>not</strong> — these two options mean very\r
-different things.</p>\r
-<ul>\r
+different things.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
The <tt>--cached</tt> option is used to ask a command that\r
the index as well.\r
</p>\r
</li>\r
-</ul>\r
-<p><tt>git apply</tt> command can be used with <tt>--cached</tt> and\r
+</ul></div>\r
+<div class="para"><p><tt>git apply</tt> command can be used with <tt>--cached</tt> and\r
<tt>--index</tt> (but not at the same time). Usually the command\r
only affects the files in the working tree, but with\r
<tt>--index</tt>, it patches both the files and their index\r
entries, and with <tt>--cached</tt>, it modifies only the index\r
-entries.</p>\r
-<p>See also http://marc.info/?l=git&m=116563135620359 and\r
+entries.</p></div>\r
+<div class="para"><p>See also http://marc.info/?l=git&m=116563135620359 and\r
http://marc.info/?l=git&m=119150393620273 for further\r
-information.</p>\r
+information.</p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by Pierre Habouzit and the git-list <git@vger.kernel.org>.</p>\r
+<div class="para"><p>Documentation by Pierre Habouzit and the git-list <git@vger.kernel.org>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:11 UTC\r
+Last updated 2008-09-19 06:33:21 UTC\r
</div>\r
</div>\r
</body>\r
</div></div>\r
<div class="para"><p>which used to be nothing more than a simple script around <tt>ls .git/refs/heads</tt>.\r
There will be an asterisk in front of the branch you are currently on.</p></div>\r
-<div class="para"><p>Sometimes you may wish to create a new branch <em>without</em> actually\r
+<div class="para"><p>Sometimes you may wish to create a new branch _without_ actually\r
checking it out and switching to it. If so, just use the command</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ git branch <branchname> [startingpoint]</tt></pre>\r
</div></div>\r
-<div class="para"><p>which will simply <em>create</em> the branch, but will not do anything further.\r
+<div class="para"><p>which will simply _create_ the branch, but will not do anything further.\r
You can then later — once you decide that you want to actually develop\r
on that branch — switch to that branch with a regular <em>git-checkout</em>\r
with the branchname as the argument.</p></div>\r
switch to it, and continue to work with it if you want to. The\r
<tt>mybranch</tt> branch will not contain the merge, but next time you merge it\r
from the <tt>master</tt> branch, git will know how you merged it, so you'll not\r
-have to do <em>that</em> merge again.</p></div>\r
+have to do _that_ merge again.</p></div>\r
<div class="para"><p>Another useful tool, especially if you do not always work in X-Window\r
environment, is <tt>git show-branch</tt>.</p></div>\r
<div class="listingblock">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-12 06:59:10 UTC\r
+Last updated 2008-09-19 06:33:23 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:12 UTC\r
+Last updated 2008-09-19 06:33:23 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:12 UTC\r
+Last updated 2008-09-19 06:33:24 UTC\r
</div>\r
</div>\r
</body>\r
<dd>\r
<p>\r
A reflog shows the local "history" of a ref. In other words,\r
- it can tell you what the 3rd last revision in <em>this</em> repository\r
- was, and what was the current state in <em>this</em> repository,\r
+ it can tell you what the 3rd last revision in _this_ repository\r
+ was, and what was the current state in _this_ repository,\r
yesterday 9:14pm. See <a href="git-reflog.html">git-reflog(1)</a> for details.\r
</p>\r
</dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-09 19:53:07 UTC\r
+Last updated 2008-09-19 06:33:23 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:10 UTC\r
+Last updated 2008-09-19 06:33:21 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-20 01:23:36 UTC\r
+Last updated 2008-09-19 06:33:20 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-29 08:56:32 UTC\r
+Last updated 2008-09-19 06:33:19 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-09-01 06:10:55 UTC\r
+Last updated 2008-09-19 06:33:20 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:10 UTC\r
+Last updated 2008-09-19 06:33:21 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:11 UTC\r
+Last updated 2008-09-19 06:33:22 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-08-29 08:56:32 UTC\r
+Last updated 2008-09-19 06:33:21 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:19 UTC\r
+Last updated 2008-09-19 06:33:25 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-22 09:19:19 UTC\r
+Last updated 2008-09-19 06:33:26 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>How to use the subtree merge strategy</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>There are situations where you want to include contents in your project\r
+<div class="para"><p>There are situations where you want to include contents in your project\r
from an independently developed project. You can just pull from the\r
-other project as long as there are no conflicting paths.</p>\r
-<p>The problematic case is when there are conflicting files. Potential\r
+other project as long as there are no conflicting paths.</p></div>\r
+<div class="para"><p>The problematic case is when there are conflicting files. Potential\r
candidates are Makefiles and other standard filenames. You could merge\r
these files but probably you do not want to. A better solution for this\r
problem can be to merge the project as its own subdirectory. This is not\r
-supported by the <em>recursive</em> merge strategy, so just pulling won't work.</p>\r
-<p>What you want is the <em>subtree</em> merge strategy, which helps you in such a\r
-situation.</p>\r
-<p>In this example, let's say you have the repository at <tt>/path/to/B</tt> (but\r
+supported by the <em>recursive</em> merge strategy, so just pulling won't work.</p></div>\r
+<div class="para"><p>What you want is the <em>subtree</em> merge strategy, which helps you in such a\r
+situation.</p></div>\r
+<div class="para"><p>In this example, let's say you have the repository at <tt>/path/to/B</tt> (but\r
it can be an URL as well, if you want). You want to merge the <em>master</em>\r
branch of that repository to the <tt>dir-B</tt> subdirectory in your current\r
-branch.</p>\r
-<p>Here is the command sequence you need:</p>\r
+branch.</p></div>\r
+<div class="para"><p>Here is the command sequence you need:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ git remote add -f Bproject /path/to/B <b>(1)</b>\r
\r
$ git pull -s subtree Bproject master <b>(5)</b></tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
name the other project "Bproject", and fetch.\r
maintain the result with subsequent merges using "subtree"\r
</p>\r
</li>\r
-</ol>\r
-<p>The first four commands are used for the initial merge, while the last\r
-one is to merge updates from <em>B project</em>.</p>\r
+</ol></div>\r
+<div class="para"><p>The first four commands are used for the initial merge, while the last\r
+one is to merge updates from <em>B project</em>.</p></div>\r
</div>\r
</div>\r
-<h2>Comparing <em>subtree</em> merge with submodules</h2>\r
+<h2 id="_comparing_em_subtree_em_merge_with_submodules">Comparing <em>subtree</em> merge with submodules</h2>\r
<div class="sectionbody">\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
The benefit of using subtree merge is that it requires less\r
submit changes if you just use submodules.\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
-<h2>Additional tips</h2>\r
+<h2 id="_additional_tips">Additional tips</h2>\r
<div class="sectionbody">\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
If you made changes to the other project in your repository, they may\r
to.\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:15 UTC\r
+Last updated 2008-09-19 06:33:26 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>allocation growing API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>Dynamically growing an array using realloc() is error prone and boring.</p>\r
-<p>Define your array with:</p>\r
-<ul>\r
+<div class="para"><p>Dynamically growing an array using realloc() is error prone and boring.</p></div>\r
+<div class="para"><p>Define your array with:</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
a pointer (<tt>ary</tt>) that points at the array, initialized to <tt>NULL</tt>;\r
array currently has, initialized to <tt>0</tt>.\r
</p>\r
</li>\r
-</ul>\r
-<p>Then before adding <tt>n`th element to the array, call `ALLOC_GROW(ary, n,\r
+</ul></div>\r
+<div class="para"><p>Then before adding <tt>n`th element to the array, call `ALLOC_GROW(ary, n,\r
alloc)</tt>. This ensures that the array can hold at least <tt>n</tt> elements by\r
-calling <tt>realloc(3)</tt> and adjusting <tt>alloc</tt> variable.</p>\r
+calling <tt>realloc(3)</tt> and adjusting <tt>alloc</tt> variable.</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>sometype *ary;\r
ALLOC_GROW(ary, nr + 1, alloc);\r
ary[nr++] = value you like;</tt></pre>\r
</div></div>\r
-<p>You are responsible for updating the <tt>nr</tt> variable.</p>\r
+<div class="para"><p>You are responsible for updating the <tt>nr</tt> variable.</p></div>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:16 UTC\r
+Last updated 2008-09-19 06:33:26 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>builtin API</title>\r
</head>\r
<div id="header">\r
<h1>builtin API</h1>\r
</div>\r
-<h2>Adding a new built-in</h2>\r
+<h2 id="_adding_a_new_built_in">Adding a new built-in</h2>\r
<div class="sectionbody">\r
-<p>There are 4 things to do to add a built-in command implementation to\r
-git:</p>\r
-<ol>\r
+<div class="para"><p>There are 4 things to do to add a built-in command implementation to\r
+git:</p></div>\r
+<div class="olist"><ol>\r
<li>\r
<p>\r
Define the implementation of the built-in command <tt>foo</tt> with\r
<div class="content">\r
<pre><tt>{ "foo", cmd_foo, <options> },</tt></pre>\r
</div></div>\r
-<p>where options is the bitwise-or of:</p>\r
-<dl>\r
+<div class="para"><p>where options is the bitwise-or of:</p></div>\r
+<div class="vlist"><dl>\r
<dt>\r
<tt>RUN_SETUP</tt>\r
</dt>\r
This makes only sense when <tt>RUN_SETUP</tt> is also set.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</li>\r
<li>\r
<p>\r
Add <tt>builtin-foo.o</tt> to <tt>BUILTIN_OBJS</tt> in <tt>Makefile</tt>.\r
</p>\r
</li>\r
-</ol>\r
-<p>Additionally, if <tt>foo</tt> is a new command, there are 3 more things to do:</p>\r
-<ol>\r
+</ol></div>\r
+<div class="para"><p>Additionally, if <tt>foo</tt> is a new command, there are 3 more things to do:</p></div>\r
+<div class="olist"><ol>\r
<li>\r
<p>\r
Add tests to <tt>t/</tt> directory.\r
Add an entry for <tt>git-foo</tt> to <tt>command-list.txt</tt>.\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</div>\r
-<h2>How a built-in is called</h2>\r
+<h2 id="_how_a_built_in_is_called">How a built-in is called</h2>\r
<div class="sectionbody">\r
-<p>The implementation <tt>cmd_foo()</tt> takes three parameters, <tt>argc</tt>, <tt>argv,\r
+<div class="para"><p>The implementation <tt>cmd_foo()</tt> takes three parameters, <tt>argc</tt>, <tt>argv,\r
and `prefix</tt>. The first two are similar to what <tt>main()</tt> of a\r
-standalone command would be called with.</p>\r
-<p>When <tt>RUN_SETUP</tt> is specified in the <tt>commands[]</tt> table, and when you\r
+standalone command would be called with.</p></div>\r
+<div class="para"><p>When <tt>RUN_SETUP</tt> is specified in the <tt>commands[]</tt> table, and when you\r
were started from a subdirectory of the work tree, <tt>cmd_foo()</tt> is called\r
after chdir(2) to the top of the work tree, and <tt>prefix</tt> gets the path\r
to the subdirectory the command started from. This allows you to\r
convert a user-supplied pathname (typically relative to that directory)\r
-to a pathname relative to the top of the work tree.</p>\r
-<p>The return value from <tt>cmd_foo()</tt> becomes the exit status of the\r
-command.</p>\r
+to a pathname relative to the top of the work tree.</p></div>\r
+<div class="para"><p>The return value from <tt>cmd_foo()</tt> becomes the exit status of the\r
+command.</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:16 UTC\r
+Last updated 2008-09-19 06:33:26 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>decorate API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>Talk about <decorate.h></p>\r
-<p>(Linus)</p>\r
+<div class="para"><p>Talk about <decorate.h></p></div>\r
+<div class="para"><p>(Linus)</p></div>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:17 UTC\r
+Last updated 2008-09-19 06:33:27 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>diff API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>The diff API is for programs that compare two sets of files (e.g. two\r
+<div class="para"><p>The diff API is for programs that compare two sets of files (e.g. two\r
trees, one tree and the index) and present the found difference in\r
various ways. The calling program is responsible for feeding the API\r
pairs of files, one from the "old" set and the corresponding one from\r
"new" set, that are different. The library called through this API is\r
-called diffcore, and is responsible for two things.</p>\r
-<ul>\r
+called diffcore, and is responsible for two things.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
finding total rewrites (<tt>-B</tt>), renames (<tt>-M</tt>) and copies (<tt>-C</tt>), and\r
caller.\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
</div>\r
-<h2>Calling sequence</h2>\r
+<h2 id="_calling_sequence">Calling sequence</h2>\r
<div class="sectionbody">\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
Prepare <tt>struct diff_options</tt> to record the set of diff options, and\r
Calling <tt>diff_flush()</tt> will produce the output.\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
-<h2>Data structures</h2>\r
+<h2 id="_data_structures">Data structures</h2>\r
<div class="sectionbody">\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<tt>struct diff_filespec</tt>\r
</p>\r
</li>\r
-</ul>\r
-<p>This is the internal representation for a single file (blob). It\r
+</ul></div>\r
+<div class="para"><p>This is the internal representation for a single file (blob). It\r
records the blob object name (if known — for a work tree file it\r
typically is a NUL SHA-1), filemode and pathname. This is what the\r
<tt>diff_addremove()</tt>, <tt>diff_change()</tt> and <tt>diff_unmerged()</tt> synthesize and\r
-feed <tt>diff_queue()</tt> function with.</p>\r
-<ul>\r
+feed <tt>diff_queue()</tt> function with.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<tt>struct diff_filepair</tt>\r
</p>\r
</li>\r
-</ul>\r
-<p>This records a pair of <tt>struct diff_filespec</tt>; the filespec for a file\r
+</ul></div>\r
+<div class="para"><p>This records a pair of <tt>struct diff_filespec</tt>; the filespec for a file\r
in the "old" set (i.e. preimage) is called <tt>one</tt>, and the filespec for a\r
file in the "new" set (i.e. postimage) is called <tt>two</tt>. A change that\r
represents file creation has NULL in <tt>one</tt>, and file deletion has NULL\r
-in <tt>two</tt>.</p>\r
-<p>A <tt>filepair</tt> starts pointing at <tt>one</tt> and <tt>two</tt> that are from the same\r
+in <tt>two</tt>.</p></div>\r
+<div class="para"><p>A <tt>filepair</tt> starts pointing at <tt>one</tt> and <tt>two</tt> that are from the same\r
filename, but <tt>diffcore_std()</tt> can break pairs and match component\r
filespecs with other filespecs from a different filepair to form new\r
-filepair. This is called <em>rename detection</em>.</p>\r
-<ul>\r
+filepair. This is called <em>rename detection</em>.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<tt>struct diff_queue</tt>\r
</p>\r
</li>\r
-</ul>\r
-<p>This is a collection of filepairs. Notable members are:</p>\r
-<dl>\r
+</ul></div>\r
+<div class="para"><p>This is a collection of filepairs. Notable members are:</p></div>\r
+<div class="vlist"><dl>\r
<dt>\r
<tt>queue</tt>\r
</dt>\r
<p>\r
The number of elements in the <tt>queue</tt> array.\r
</p>\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<tt>struct diff_options</tt>\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</dd>\r
-</dl>\r
-<p>This describes the set of options the calling program wants to affect\r
-the operation of diffcore library with.</p>\r
-<p>Notable members are:</p>\r
-<dl>\r
+</dl></div>\r
+<div class="para"><p>This describes the set of options the calling program wants to affect\r
+the operation of diffcore library with.</p></div>\r
+<div class="para"><p>Notable members are:</p></div>\r
+<div class="vlist"><dl>\r
<dt>\r
<tt>output_format</tt>\r
</dt>\r
operation, but some do not have anything to do with the diffcore\r
library.\r
</p>\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
BINARY, TEXT\r
</dt>\r
and postimage set.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</dd>\r
-</dl>\r
-<p>(JC)</p>\r
+</dl></div>\r
+<div class="para"><p>(JC)</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:17 UTC\r
+Last updated 2008-09-19 06:33:27 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>directory listing API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>The directory listing API is used to enumerate paths in the work tree,\r
+<div class="para"><p>The directory listing API is used to enumerate paths in the work tree,\r
optionally taking <tt>.git/info/exclude</tt> and <tt>.gitignore</tt> files per\r
-directory into account.</p>\r
+directory into account.</p></div>\r
</div>\r
</div>\r
-<h2>Data structure</h2>\r
+<h2 id="_data_structure">Data structure</h2>\r
<div class="sectionbody">\r
-<p><tt>struct dir_struct</tt> structure is used to pass directory traversal\r
+<div class="para"><p><tt>struct dir_struct</tt> structure is used to pass directory traversal\r
options to the library and to record the paths discovered. The notable\r
-options are:</p>\r
-<dl>\r
+options are:</p></div>\r
+<div class="vlist"><dl>\r
<dt>\r
<tt>exclude_per_dir</tt>\r
</dt>\r
Internal use; keeps track of allocation of <tt>entries[]</tt> array.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Calling sequence</h2>\r
+<h2 id="_calling_sequence">Calling sequence</h2>\r
<div class="sectionbody">\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
Prepare <tt>struct dir_struct dir</tt> and clear it with <tt>memset(&dir, 0,\r
Use <tt>dir.entries[]</tt>.\r
</p>\r
</li>\r
-</ul>\r
-<p>(JC)</p>\r
+</ul></div>\r
+<div class="para"><p>(JC)</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:17 UTC\r
+Last updated 2008-09-19 06:33:28 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>gitattributes API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>gitattributes mechanism gives a uniform way to associate various\r
-attributes to set of paths.</p>\r
+<div class="para"><p>gitattributes mechanism gives a uniform way to associate various\r
+attributes to set of paths.</p></div>\r
</div>\r
</div>\r
-<h2>Data Structure</h2>\r
+<h2 id="_data_structure">Data Structure</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
<tt>struct git_attr</tt>\r
</dt>\r
to <tt>git_checkattr()</tt> function, and receives the results.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Calling Sequence</h2>\r
+<h2 id="_calling_sequence">Calling Sequence</h2>\r
<div class="sectionbody">\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
Prepare an array of <tt>struct git_attr_check</tt> to define the list of\r
the array is defined for the path.\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
-<h2>Attribute Values</h2>\r
+<h2 id="_attribute_values">Attribute Values</h2>\r
<div class="sectionbody">\r
-<p>An attribute for a path can be in one of four states: Set, Unset,\r
+<div class="para"><p>An attribute for a path can be in one of four states: Set, Unset,\r
Unspecified or set to a string, and <tt>.value</tt> member of <tt>struct\r
-git_attr_check</tt> records it. There are three macros to check these:</p>\r
-<dl>\r
+git_attr_check</tt> records it. There are three macros to check these:</p></div>\r
+<div class="vlist"><dl>\r
<dt>\r
<tt>ATTR_TRUE()</tt>\r
</dt>\r
Returns true if the attribute is Unspecified for the path.\r
</p>\r
</dd>\r
-</dl>\r
-<p>If none of the above returns true, <tt>.value</tt> member points at a string\r
-value of the attribute for the path.</p>\r
+</dl></div>\r
+<div class="para"><p>If none of the above returns true, <tt>.value</tt> member points at a string\r
+value of the attribute for the path.</p></div>\r
</div>\r
-<h2>Example</h2>\r
+<h2 id="_example">Example</h2>\r
<div class="sectionbody">\r
-<p>To see how attributes "crlf" and "indent" are set for different paths.</p>\r
-<ol>\r
+<div class="para"><p>To see how attributes "crlf" and "indent" are set for different paths.</p></div>\r
+<div class="olist"><ol>\r
<li>\r
<p>\r
Prepare an array of <tt>struct git_attr_check</tt> with two elements (because\r
pointers to <tt>struct git_attr</tt> obtained by calling <tt>git_attr()</tt>:\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>static struct git_attr_check check[2];\r
check[1].attr = git_attr("ident", 5);\r
}</tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="olist"><ol>\r
<li>\r
<p>\r
Call <tt>git_checkattr()</tt> with the prepared array of <tt>struct git_attr_check</tt>:\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt> const char *path;\r
setup_check();\r
git_checkattr(path, ARRAY_SIZE(check), check);</tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="olist"><ol>\r
<li>\r
<p>\r
Act on <tt>.value</tt> member of the result, left in <tt>check[]</tt>:\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt> const char *value = check[0].value;\r
...\r
}</tt></pre>\r
</div></div>\r
-<p>(JC)</p>\r
+<div class="para"><p>(JC)</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:18 UTC\r
+Last updated 2008-09-19 06:33:28 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>grep API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>Talk about <grep.h>, things like:</p>\r
-<ul>\r
+<div class="para"><p>Talk about <grep.h>, things like:</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
grep_buffer()\r
</p>\r
</li>\r
-</ul>\r
-<p>(JC)</p>\r
+</ul></div>\r
+<div class="para"><p>(JC)</p></div>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:18 UTC\r
+Last updated 2008-09-19 06:33:28 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>hash API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>Talk about <hash.h></p>\r
-<p>(Linus)</p>\r
+<div class="para"><p>Talk about <hash.h></p></div>\r
+<div class="para"><p>(Linus)</p></div>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:18 UTC\r
+Last updated 2008-09-19 06:33:29 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>history graph API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>The graph API is used to draw a text-based representation of the commit\r
-history. The API generates the graph in a line-by-line fashion.</p>\r
+<div class="para"><p>The graph API is used to draw a text-based representation of the commit\r
+history. The API generates the graph in a line-by-line fashion.</p></div>\r
</div>\r
</div>\r
-<h2>Functions</h2>\r
+<h2 id="_functions">Functions</h2>\r
<div class="sectionbody">\r
-<p>Core functions:</p>\r
-<ul>\r
+<div class="para"><p>Core functions:</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<tt>graph_init()</tt> creates a new <tt>struct git_graph</tt>\r
the graph was omitted.\r
</p>\r
</li>\r
-</ul>\r
-<p>The following utility functions are wrappers around <tt>graph_next_line()</tt> and\r
+</ul></div>\r
+<div class="para"><p>The following utility functions are wrappers around <tt>graph_next_line()</tt> and\r
<tt>graph_is_commit_finished()</tt>. They always print the output to stdout.\r
They can all be called with a NULL graph argument, in which case no graph\r
-output will be printed.</p>\r
-<ul>\r
+output will be printed.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<tt>graph_show_commit()</tt> calls <tt>graph_next_line()</tt> until it returns non-zero.\r
end in a newline if and only if the strbuf ends in a newline.\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
-<h2>Data structure</h2>\r
+<h2 id="_data_structure">Data structure</h2>\r
<div class="sectionbody">\r
-<p><tt>struct git_graph</tt> is an opaque data type used to store the current graph\r
-state.</p>\r
+<div class="para"><p><tt>struct git_graph</tt> is an opaque data type used to store the current graph\r
+state.</p></div>\r
</div>\r
-<h2>Calling sequence</h2>\r
+<h2 id="_calling_sequence">Calling sequence</h2>\r
<div class="sectionbody">\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
Create a <tt>struct git_graph</tt> by calling <tt>graph_init()</tt>. When using the\r
alongside the graph output.\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
-<h2>Limitations</h2>\r
+<h2 id="_limitations">Limitations</h2>\r
<div class="sectionbody">\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<tt>graph_update()</tt> must be called with commits in topological order. It should\r
on all parents of that commit. Parents must not be skipped, or the graph\r
output will appear incorrect.\r
</p>\r
-<p><tt>graph_update()</tt> may be used on a pruned set of commits only if the parent list\r
-has been rewritten so as to include only ancestors from the pruned set.</p>\r
+<div class="para"><p><tt>graph_update()</tt> may be used on a pruned set of commits only if the parent list\r
+has been rewritten so as to include only ancestors from the pruned set.</p></div>\r
</li>\r
<li>\r
<p>\r
(efficient) mechanism to find the children of a commit.\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
-<h2>Sample usage</h2>\r
+<h2 id="_sample_usage">Sample usage</h2>\r
<div class="sectionbody">\r
<div class="listingblock">\r
<div class="content">\r
graph_release(graph);</tt></pre>\r
</div></div>\r
</div>\r
-<h2>Sample output</h2>\r
+<h2 id="_sample_output">Sample output</h2>\r
<div class="sectionbody">\r
-<p>The following is an example of the output from the graph API. This output does\r
+<div class="para"><p>The following is an example of the output from the graph API. This output does\r
not include any commit summary information—callers are responsible for\r
-outputting that information, if desired.</p>\r
+outputting that information, if desired.</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>*\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:19 UTC\r
+Last updated 2008-09-19 06:33:29 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>in-core index API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>Talk about <read-cache.c> and <cache-tree.c>, things like:</p>\r
-<ul>\r
+<div class="para"><p>Talk about <read-cache.c> and <cache-tree.c>, things like:</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
cache -> the_index macros\r
cache_tree_update()\r
</p>\r
</li>\r
-</ul>\r
-<p>(JC, Linus)</p>\r
+</ul></div>\r
+<div class="para"><p>(JC, Linus)</p></div>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:19 UTC\r
+Last updated 2008-09-19 06:33:29 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>lockfile API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>The lockfile API serves two purposes:</p>\r
-<ul>\r
+<div class="para"><p>The lockfile API serves two purposes:</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
Mutual exclusion. When we write out a new index file, first\r
when the program dies on a signal.\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
</div>\r
-<h2>The functions</h2>\r
+<h2 id="_the_functions">The functions</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
hold_lock_file_for_update\r
</dt>\r
a negative value on failure to close(2).\r
</p>\r
</dd>\r
-</dl>\r
-<p>Because the structure is used in an <tt>atexit(3)</tt> handler, its\r
+</dl></div>\r
+<div class="para"><p>Because the structure is used in an <tt>atexit(3)</tt> handler, its\r
storage has to stay throughout the life of the program. It\r
-cannot be an auto variable allocated on the stack.</p>\r
-<p>Call <tt>commit_lock_file()</tt> or <tt>rollback_lock_file()</tt> when you are\r
+cannot be an auto variable allocated on the stack.</p></div>\r
+<div class="para"><p>Call <tt>commit_lock_file()</tt> or <tt>rollback_lock_file()</tt> when you are\r
done writing to the file descriptor. If you do not call either\r
and simply <tt>exit(3)</tt> from the program, an <tt>atexit(3)</tt> handler\r
-will close and remove the lockfile.</p>\r
-<p>If you need to close the file descriptor you obtained from\r
+will close and remove the lockfile.</p></div>\r
+<div class="para"><p>If you need to close the file descriptor you obtained from\r
<tt>hold_lock_file_for_update</tt> function yourself, do so by calling\r
<tt>close_lock_file()</tt>. You should never call <tt>close(2)</tt> yourself!\r
Otherwise the <tt>struct\r
<tt>close(2)</tt>. Worse yet, if you <tt>close(2)</tt>, open another file\r
descriptor for completely different purpose, and then call\r
<tt>commit_lock_file()</tt> or <tt>rollback_lock_file()</tt>, they may close\r
-that unrelated file descriptor.</p>\r
+that unrelated file descriptor.</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:19 UTC\r
+Last updated 2008-09-19 06:33:30 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>object access API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>Talk about <sha1_file.c> and <object.h> family, things like</p>\r
-<ul>\r
+<div class="para"><p>Talk about <sha1_file.c> and <object.h> family, things like</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
read_sha1_file()\r
Use of object flags\r
</p>\r
</li>\r
-</ul>\r
-<p>(JC, Shawn, Daniel, Dscho, Linus)</p>\r
+</ul></div>\r
+<div class="para"><p>(JC, Shawn, Daniel, Dscho, Linus)</p></div>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:20 UTC\r
+Last updated 2008-09-19 06:33:30 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>parse-options API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>The parse-options API is used to parse and massage options in git\r
-and to provide a usage help with consistent look.</p>\r
+<div class="para"><p>The parse-options API is used to parse and massage options in git\r
+and to provide a usage help with consistent look.</p></div>\r
</div>\r
</div>\r
-<h2>Basics</h2>\r
+<h2 id="_basics">Basics</h2>\r
<div class="sectionbody">\r
-<p>The argument vector <tt>argv[]</tt> may usually contain mandatory or optional\r
+<div class="para"><p>The argument vector <tt>argv[]</tt> may usually contain mandatory or optional\r
<em>non-option arguments</em>, e.g. a filename or a branch, and <em>options</em>.\r
Options are optional arguments that start with a dash and\r
-that allow to change the behavior of a command.</p>\r
-<ul>\r
+that allow to change the behavior of a command.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
There are basically three types of options:\r
Please define <em>lower-case long options</em> only.\r
</p>\r
</li>\r
-</ul>\r
-<p>The parse-options API allows:</p>\r
-<ul>\r
+</ul></div>\r
+<div class="para"><p>The parse-options API allows:</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<em>sticked</em> and <em>separate form</em> of options with arguments.\r
<tt>--this-is-a-file</tt> must not be processed as an option.\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
-<h2>Steps to parse options</h2>\r
+<h2 id="_steps_to_parse_options">Steps to parse options</h2>\r
<div class="sectionbody">\r
-<ol>\r
+<div class="olist"><ol>\r
<li>\r
<p>\r
<tt>#include "parse-options.h"</tt>\r
<div class="content">\r
<pre><tt>argc = parse_options(argc, argv, builtin_foo_options, builtin_foo_usage, flags);</tt></pre>\r
</div></div>\r
-<p><tt>parse_options()</tt> will filter out the processed options of <tt>argv[]</tt> and leave the\r
+<div class="para"><p><tt>parse_options()</tt> will filter out the processed options of <tt>argv[]</tt> and leave the\r
non-option arguments in <tt>argv[]</tt>.\r
-<tt>argc</tt> is updated appropriately because of the assignment.</p>\r
-<p>Flags are the bitwise-or of:</p>\r
-<dl>\r
+<tt>argc</tt> is updated appropriately because of the assignment.</p></div>\r
+<div class="para"><p>Flags are the bitwise-or of:</p></div>\r
+<div class="vlist"><dl>\r
<dt>\r
<tt>PARSE_OPT_KEEP_DASHDASH</tt>\r
</dt>\r
argument.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</li>\r
-</ol>\r
+</ol></div>\r
</div>\r
-<h2>Data Structure</h2>\r
+<h2 id="_data_structure">Data Structure</h2>\r
<div class="sectionbody">\r
-<p>The main data structure is an array of the <tt>option</tt> struct,\r
+<div class="para"><p>The main data structure is an array of the <tt>option</tt> struct,\r
say <tt>static struct option builtin_add_options[]</tt>.\r
-There are some macros to easily define options:</p>\r
-<dl>\r
+There are some macros to easily define options:</p></div>\r
+<div class="vlist"><dl>\r
<dt>\r
<tt>OPT__ABBREV(&int_var)</tt>\r
</dt>\r
Introduce a long-option argument that will be kept in <tt>argv[]</tt>.\r
</p>\r
</dd>\r
-</dl>\r
-<p>The last element of the array must be <tt>OPT_END()</tt>.</p>\r
-<p>If not stated otherwise, interpret the arguments as follows:</p>\r
-<ul>\r
+</dl></div>\r
+<div class="para"><p>The last element of the array must be <tt>OPT_END()</tt>.</p></div>\r
+<div class="para"><p>If not stated otherwise, interpret the arguments as follows:</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<tt>short</tt> is a character for the short option\r
omitted at the end.\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
-<h2>Option Callbacks</h2>\r
+<h2 id="_option_callbacks">Option Callbacks</h2>\r
<div class="sectionbody">\r
-<p>The function must be defined in this form:</p>\r
+<div class="para"><p>The function must be defined in this form:</p></div>\r
<div class="literalblock">\r
<div class="content">\r
<pre><tt>int func(const struct option *opt, const char *arg, int unset)</tt></pre>\r
</div></div>\r
-<p>The callback mechanism is as follows:</p>\r
-<ul>\r
+<div class="para"><p>The callback mechanism is as follows:</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
Inside <tt>funct</tt>, the only interesting member of the structure\r
If the user negates the option, <tt>arg</tt> is <tt>NULL</tt> and <tt>unset</tt> is 1.\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
-<h2>Sophisticated option parsing</h2>\r
+<h2 id="_sophisticated_option_parsing">Sophisticated option parsing</h2>\r
<div class="sectionbody">\r
-<p>If you need, for example, option callbacks with optional arguments\r
+<div class="para"><p>If you need, for example, option callbacks with optional arguments\r
or without arguments at all, or if you need other special cases,\r
that are not handled by the macros above, you need to specify the\r
-members of the <tt>option</tt> structure manually.</p>\r
-<p>This is not covered in this document, but well documented\r
-in <tt>parse-options.h</tt> itself.</p>\r
+members of the <tt>option</tt> structure manually.</p></div>\r
+<div class="para"><p>This is not covered in this document, but well documented\r
+in <tt>parse-options.h</tt> itself.</p></div>\r
</div>\r
-<h2>Examples</h2>\r
+<h2 id="_examples">Examples</h2>\r
<div class="sectionbody">\r
-<p>See <tt>test-parse-options.c</tt> and\r
+<div class="para"><p>See <tt>test-parse-options.c</tt> and\r
<tt>builtin-add.c</tt>,\r
<tt>builtin-clone.c</tt>,\r
<tt>builtin-commit.c</tt>,\r
<tt>builtin-fetch.c</tt>,\r
<tt>builtin-fsck.c</tt>,\r
<tt>builtin-rm.c</tt>\r
-for real-world examples.</p>\r
+for real-world examples.</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:20 UTC\r
+Last updated 2008-09-19 06:33:30 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>quote API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>Talk about <quote.h>, things like</p>\r
-<ul>\r
+<div class="para"><p>Talk about <quote.h>, things like</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
sq_quote and unquote\r
quoting for foreign languages\r
</p>\r
</li>\r
-</ul>\r
-<p>(JC)</p>\r
+</ul></div>\r
+<div class="para"><p>(JC)</p></div>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:21 UTC\r
+Last updated 2008-09-19 06:33:31 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>Remotes configuration API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>The API in remote.h gives access to the configuration related to\r
+<div class="para"><p>The API in remote.h gives access to the configuration related to\r
remotes. It handles all three configuration mechanisms historically\r
and currently used by git, and presents the information in a uniform\r
fashion. Note that the code also handles plain URLs without any\r
-configuration, giving them just the default information.</p>\r
+configuration, giving them just the default information.</p></div>\r
</div>\r
</div>\r
-<h2>struct remote</h2>\r
+<h2 id="_struct_remote">struct remote</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
<tt>name</tt>\r
</dt>\r
The proxy to use for curl (http, https, ftp, etc.) URLs.\r
</p>\r
</dd>\r
-</dl>\r
-<p>struct remotes can be found by name with remote_get(), and iterated\r
+</dl></div>\r
+<div class="para"><p>struct remotes can be found by name with remote_get(), and iterated\r
through with for_each_remote(). remote_get(NULL) will return the\r
-default remote, given the current branch and configuration.</p>\r
+default remote, given the current branch and configuration.</p></div>\r
</div>\r
-<h2>struct refspec</h2>\r
+<h2 id="_struct_refspec">struct refspec</h2>\r
<div class="sectionbody">\r
-<p>A struct refspec holds the parsed interpretation of a refspec. If it\r
+<div class="para"><p>A struct refspec holds the parsed interpretation of a refspec. If it\r
will force updates (starts with a <em>+</em>), force is true. If it is a\r
pattern (sides end with <em>*</em>) pattern is true. src and dest are the two\r
sides (if a pattern, only the part outside of the wildcards); if there\r
is only one side, it is src, and dst is NULL; if sides exist but are\r
empty (i.e., the refspec either starts or ends with <em>:</em>), the\r
-corresponding side is "".</p>\r
-<p>This parsing can be done to an array of strings to give an array of\r
-struct refpsecs with parse_ref_spec().</p>\r
-<p>remote_find_tracking(), given a remote and a struct refspec with\r
+corresponding side is "".</p></div>\r
+<div class="para"><p>This parsing can be done to an array of strings to give an array of\r
+struct refpsecs with parse_ref_spec().</p></div>\r
+<div class="para"><p>remote_find_tracking(), given a remote and a struct refspec with\r
either src or dst filled out, will fill out the other such that the\r
result is in the "fetch" specification for the remote (note that this\r
-evaluates patterns and returns a single result).</p>\r
+evaluates patterns and returns a single result).</p></div>\r
</div>\r
-<h2>struct branch</h2>\r
+<h2 id="_struct_branch">struct branch</h2>\r
<div class="sectionbody">\r
-<p>Note that this may end up moving to branch.h</p>\r
-<p>struct branch holds the configuration for a branch. It can be looked\r
-branch_get(NULL) for HEAD.</p>\r
-<p>It contains:</p>\r
-<dl>\r
+<div class="para"><p>Note that this may end up moving to branch.h</p></div>\r
+<div class="para"><p>struct branch holds the configuration for a branch. It can be looked\r
+branch_get(NULL) for HEAD.</p></div>\r
+<div class="para"><p>It contains:</p></div>\r
+<div class="vlist"><dl>\r
<dt>\r
<tt>name</tt>\r
</dt>\r
The number of merge configurations\r
</p>\r
</dd>\r
-</dl>\r
-<p>branch_has_merge_config() returns true if the given branch has merge\r
-configuration given.</p>\r
+</dl></div>\r
+<div class="para"><p>branch_has_merge_config() returns true if the given branch has merge\r
+configuration given.</p></div>\r
</div>\r
-<h2>Other stuff</h2>\r
+<h2 id="_other_stuff">Other stuff</h2>\r
<div class="sectionbody">\r
-<p>There is other stuff in remote.h that is related, in general, to the\r
-process of interacting with remotes.</p>\r
-<p>(Daniel Barkalow)</p>\r
+<div class="para"><p>There is other stuff in remote.h that is related, in general, to the\r
+process of interacting with remotes.</p></div>\r
+<div class="para"><p>(Daniel Barkalow)</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:21 UTC\r
+Last updated 2008-09-19 06:33:31 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>revision walking API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>The revision walking API offers functions to build a list of revisions\r
-and then iterate over that list.</p>\r
+<div class="para"><p>The revision walking API offers functions to build a list of revisions\r
+and then iterate over that list.</p></div>\r
</div>\r
</div>\r
-<h2>Calling sequence</h2>\r
+<h2 id="_calling_sequence">Calling sequence</h2>\r
<div class="sectionbody">\r
-<p>The walking API has a given calling sequence: first you need to\r
+<div class="para"><p>The walking API has a given calling sequence: first you need to\r
initialize a rev_info structure, then add revisions to control what kind\r
of revision list do you want to get, finally you can iterate over the\r
-revision list.</p>\r
+revision list.</p></div>\r
</div>\r
-<h2>Functions</h2>\r
+<h2 id="_functions">Functions</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
<tt>init_revisions</tt>\r
</dt>\r
revision list is indicated by returning a NULL pointer.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Data structures</h2>\r
+<h2 id="_data_structures">Data structures</h2>\r
<div class="sectionbody">\r
-<p>Talk about <revision.h>, things like:</p>\r
-<ul>\r
+<div class="para"><p>Talk about <revision.h>, things like:</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
two diff_options, one for path limiting, another for output;\r
remaining functions;\r
</p>\r
</li>\r
-</ul>\r
-<p>(Linus, JC, Dscho)</p>\r
+</ul></div>\r
+<div class="para"><p>(Linus, JC, Dscho)</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:22 UTC\r
+Last updated 2008-09-19 06:33:32 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-20 01:23:36 UTC\r
+Last updated 2008-09-19 06:33:32 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>setup API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>Talk about</p>\r
-<ul>\r
+<div class="para"><p>Talk about</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
setup_git_directory()\r
get_pathspec()\r
</p>\r
</li>\r
-</ul>\r
-<p>(Dscho)</p>\r
+</ul></div>\r
+<div class="para"><p>(Dscho)</p></div>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:22 UTC\r
+Last updated 2008-09-19 06:33:33 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>strbuf API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>strbuf's are meant to be used with all the usual C string and memory\r
+<div class="para"><p>strbuf's are meant to be used with all the usual C string and memory\r
APIs. Given that the length of the buffer is known, it's often better to\r
use the mem* functions than a str* one (memchr vs. strchr e.g.).\r
Though, one has to be careful about the fact that str* functions often\r
-stop on NULs and that strbufs may have embedded NULs.</p>\r
-<p>An strbuf is NUL terminated for convenience, but no function in the\r
-strbuf API actually relies on the string being free of NULs.</p>\r
-<p>strbufs has some invariants that are very important to keep in mind:</p>\r
-<ol>\r
+stop on NULs and that strbufs may have embedded NULs.</p></div>\r
+<div class="para"><p>An strbuf is NUL terminated for convenience, but no function in the\r
+strbuf API actually relies on the string being free of NULs.</p></div>\r
+<div class="para"><p>strbufs has some invariants that are very important to keep in mind:</p></div>\r
+<div class="olist"><ol>\r
<li>\r
<p>\r
The <tt>buf</tt> member is never NULL, so you it can be used in any usual C\r
string operations safely. strbuf's _have_ to be initialized either by\r
<tt>strbuf_init()</tt> or by <tt>= STRBUF_INIT</tt> before the invariants, though.\r
</p>\r
-<p>Do <strong>not</strong> assume anything on what <tt>buf</tt> really is (e.g. if it is\r
+<div class="para"><p>Do <strong>not</strong> assume anything on what <tt>buf</tt> really is (e.g. if it is\r
allocated memory or not), use <tt>strbuf_detach()</tt> to unwrap a memory\r
buffer from its strbuf shell in a safe way. That is the sole supported\r
-way. This will give you a malloced buffer that you can later <tt>free()</tt>.</p>\r
-<p>However, it it totally safe to modify anything in the string pointed by\r
-the <tt>buf</tt> member, between the indices <tt>0</tt> and <tt>len-1</tt> (inclusive).</p>\r
+way. This will give you a malloced buffer that you can later <tt>free()</tt>.</p></div>\r
+<div class="para"><p>However, it it totally safe to modify anything in the string pointed by\r
+the <tt>buf</tt> member, between the indices <tt>0</tt> and <tt>len-1</tt> (inclusive).</p></div>\r
</li>\r
<li>\r
<p>\r
<pre><tt>strbuf_grow(sb, SOME_SIZE); <b>(1)</b>\r
strbuf_setlen(sb, sb->len + SOME_OTHER_SIZE);</tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
Here, the memory array starting at <tt>sb->buf</tt>, and of length\r
<td class="content"><tt>SOME_OTHER_SIZE</tt> must be smaller or equal to <tt>strbuf_avail(sb)</tt>.</td>\r
</tr></table>\r
</div>\r
-<p>Doing so is safe, though if it has to be done in many places, adding the\r
-missing API to the strbuf module is the way to go.</p>\r
+<div class="para"><p>Doing so is safe, though if it has to be done in many places, adding the\r
+missing API to the strbuf module is the way to go.</p></div>\r
<div class="admonitionblock">\r
<table><tr>\r
<td class="icon">\r
</tr></table>\r
</div>\r
</li>\r
-</ol>\r
+</ol></div>\r
</li>\r
-</ol>\r
+</ol></div>\r
</div>\r
</div>\r
-<h2>Data structures</h2>\r
+<h2 id="_data_structures">Data structures</h2>\r
<div class="sectionbody">\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<tt>struct strbuf</tt>\r
</p>\r
</li>\r
-</ul>\r
-<p>This is string buffer structure. The <tt>len</tt> member can be used to\r
+</ul></div>\r
+<div class="para"><p>This is string buffer structure. The <tt>len</tt> member can be used to\r
determine the current length of the string, and <tt>buf</tt> member provides access to\r
-the string itself.</p>\r
+the string itself.</p></div>\r
</div>\r
-<h2>Functions</h2>\r
+<h2 id="_functions">Functions</h2>\r
<div class="sectionbody">\r
-<ul>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
Life cycle\r
</p>\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
<tt>strbuf_init</tt>\r
</dt>\r
Swap the contents of two string buffers.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</li>\r
<li>\r
<p>\r
Related to the size of the buffer\r
</p>\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
<tt>strbuf_avail</tt>\r
</dt>\r
Empty the buffer by setting the size of it to zero.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</li>\r
<li>\r
<p>\r
Related to the contents of the buffer\r
</p>\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
<tt>strbuf_rtrim</tt>\r
</dt>\r
to match, or be greater than the second buffer.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</li>\r
<li>\r
<p>\r
Adding data to the buffer\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
<div class="admonitionblock">\r
<table><tr>\r
<td class="icon">\r
necessary.</td>\r
</tr></table>\r
</div>\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
<tt>strbuf_addch</tt>\r
</dt>\r
<div class="content">\r
<pre><tt>strbuf_add(..., s, strlen(s));</tt></pre>\r
</div></div>\r
-<p>Meaning that this is efficient to write things like:</p>\r
+<div class="para"><p>Meaning that this is efficient to write things like:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>strbuf_addstr(sb, "immediate string");</tt></pre>\r
placeholders. To that end, it parses the string and calls the specified\r
function for every percent sign found.\r
</p>\r
-<p>The callback function is given a pointer to the character after the <tt>%</tt>\r
+<div class="para"><p>The callback function is given a pointer to the character after the <tt>%</tt>\r
and a pointer to the struct strbuf. It is expected to add the expanded\r
version of the placeholder to the strbuf, e.g. to add a newline\r
character if the letter <tt>n</tt> appears after a <tt>%</tt>. The function returns\r
the length of the placeholder recognized and <tt>strbuf_expand()</tt> skips\r
-over it.</p>\r
-<p>All other characters (non-percent and not skipped ones) are copied\r
+over it.</p></div>\r
+<div class="para"><p>All other characters (non-percent and not skipped ones) are copied\r
verbatim to the strbuf. If the callback returned zero, meaning that the\r
-placeholder is unknown, then the percent sign is copied, too.</p>\r
-<p>In order to facilitate caching and to make it possible to give\r
+placeholder is unknown, then the percent sign is copied, too.</p></div>\r
+<div class="para"><p>In order to facilitate caching and to make it possible to give\r
parameters to the callback, <tt>strbuf_expand()</tt> passes a context pointer,\r
-which can be used by the programmer of the callback as she sees fit.</p>\r
+which can be used by the programmer of the callback as she sees fit.</p></div>\r
</dd>\r
<dt>\r
<tt>strbuf_addf</tt>\r
<tt>launch_editor</tt>\r
</dt>\r
<dd>\r
-<p>\r
-</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:22 UTC\r
+Last updated 2008-09-19 06:33:33 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-24 04:02:44 UTC\r
+Last updated 2008-09-19 06:33:33 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>tree walking API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>Talk about <tree-walk.h>, things like</p>\r
-<ul>\r
+<div class="para"><p>Talk about <tree-walk.h>, things like</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
struct tree_desc\r
get_tree_entry\r
</p>\r
</li>\r
-</ul>\r
-<p>(JC, Linus)</p>\r
+</ul></div>\r
+<div class="para"><p>(JC, Linus)</p></div>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:22 UTC\r
+Last updated 2008-09-19 06:33:34 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>xdiff interface API</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>Talk about our calling convention to xdiff library, including\r
-xdiff_emit_consume_fn.</p>\r
-<p>(Dscho, JC)</p>\r
+<div class="para"><p>Talk about our calling convention to xdiff library, including\r
+xdiff_emit_consume_fn.</p></div>\r
+<div class="para"><p>(Dscho, JC)</p></div>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:23 UTC\r
+Last updated 2008-09-19 06:33:34 UTC\r
</div>\r
</div>\r
</body>\r
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User's Manual (for version 1.5.3 or newer)</title><link rel="stylesheet" href="docbook-xsl.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.73.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="id
393972"></a>Git User's Manual (for version 1.5.3 or newer)</h1></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="preface"><a href="#id471788">Preface</a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-with-git-fetch">Updating a repository with git-fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-comments-with-given-content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-with-git">3. Developing with git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-with-git-pull">Getting updates with git-pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a git repository via the git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via http</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git-rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-with-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git-fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#_pitfalls_with_submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory -> index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index -> object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database -> index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index -> working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git's source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. GIT Glossary</a></span></dt><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt></dl></div><div class="preface" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="id471788"></a>Preface</h2></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User's Manual (for version 1.5.3 or newer)</title><link rel="stylesheet" href="docbook-xsl.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.73.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="id
479752"></a>Git User's Manual (for version 1.5.3 or newer)</h1></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="preface"><a href="#id557833">Preface</a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-with-git-fetch">Updating a repository with git-fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-comments-with-given-content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-with-git">3. Developing with git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-with-git-pull">Getting updates with git-pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a git repository via the git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via http</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git-rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-with-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git-fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#_pitfalls_with_submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory -> index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index -> object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database -> index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index -> working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git's source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. GIT Glossary</a></span></dt><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt></dl></div><div class="preface" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="id557833"></a>Preface</h2></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX
command-line skills, but no previous knowledge of git.</p><p><a class="xref" href="#repositories-and-branches" title="Chapter 1. Repositories and Branches">Chapter 1, <i>Repositories and Branches</i></a> and <a class="xref" href="#exploring-git-history" title="Chapter 2. Exploring git history">Chapter 2, <i>Exploring git history</i></a> explain how
to fetch and study a project using git—read these chapters to learn how
to build and test a particular version of a software project, search for
My Various Git Projects / git.git / commitdiff