summaryrefslogtreecommitdiffstats
path: root/everyday.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-09-19 06:37:10 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-09-19 06:37:10 +0000
commit4604fe5609a48fc240d1a88a15c642c9883363c7 (patch)
tree846c5b418d438e9580d0a7702be832f1d1d9874c /everyday.html
parent5e4d8dee8bb242deb8fd16e7dcd74a0e7fb713d2 (diff)
downloadgit-htmldocs-4604fe5609a48fc240d1a88a15c642c9883363c7.tar.gz
Autogenerated HTML docs for v1.6.0.2-287-g3791f
Diffstat (limited to 'everyday.html')
-rw-r--r--everyday.html226
1 files changed, 137 insertions, 89 deletions
diff --git a/everyday.html b/everyday.html
index 702b25de5..ca2911cff 100644
--- a/everyday.html
+++ b/everyday.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.2" />
+<meta name="generator" content="AsciiDoc 8.2.5" />
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -16,8 +16,13 @@ body {
margin: 1em 5% 1em 5%;
}
-a { color: blue; }
-a:visited { color: fuchsia; }
+a {
+ color: blue;
+ text-decoration: underline;
+}
+a:visited {
+ color: fuchsia;
+}
em {
font-style: italic;
@@ -39,13 +44,18 @@ h1, h2, h3, h4, h5, h6 {
line-height: 1.3;
}
-h1 {
+h1, h2, h3 {
border-bottom: 2px solid silver;
}
h2 {
- border-bottom: 2px solid silver;
padding-top: 0.5em;
}
+h3 {
+ float: left;
+}
+h3 + * {
+ clear: left;
+}
div.sectionbody {
font-family: serif;
@@ -70,7 +80,7 @@ span#author {
color: #527bbd;
font-family: sans-serif;
font-weight: bold;
- font-size: 1.2em;
+ font-size: 1.1em;
}
span#email {
}
@@ -139,6 +149,9 @@ div.sidebarblock > div.content {
padding: 0.5em;
}
+div.listingblock {
+ margin-right: 0%;
+}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
@@ -148,9 +161,13 @@ div.listingblock > div.content {
div.quoteblock > div.content {
padding-left: 2.0em;
}
-div.quoteblock .attribution {
+
+div.attribution {
text-align: right;
}
+div.verseblock + div.attribution {
+ text-align: left;
+}
div.admonitionblock .icon {
vertical-align: top;
@@ -194,13 +211,12 @@ dd > *:first-child {
ul, ol {
list-style-position: outside;
}
-ol.olist2 {
+div.olist2 ol {
list-style-type: lower-alpha;
}
div.tableblock > table {
- border-color: #527bbd;
- border-width: 3px;
+ border: 3px solid #527bbd;
}
thead {
font-family: sans-serif;
@@ -214,6 +230,9 @@ div.hlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
+div.hlist td {
+ padding-bottom: 5px;
+}
td.hlist1 {
vertical-align: top;
font-style: italic;
@@ -226,6 +245,32 @@ td.hlist2 {
@media print {
div#footer-badges { display: none; }
}
+
+div#toctitle {
+ color: #527bbd;
+ font-family: sans-serif;
+ font-size: 1.1em;
+ font-weight: bold;
+ margin-top: 1.0em;
+ margin-bottom: 0.1em;
+}
+
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+div.toclevel2 {
+ margin-left: 2em;
+ font-size: 0.9em;
+}
+div.toclevel3 {
+ margin-left: 4em;
+ font-size: 0.9em;
+}
+div.toclevel4 {
+ margin-left: 6em;
+ font-size: 0.9em;
+}
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -254,6 +299,9 @@ div.exampleblock-content {
border-left: 2px solid silver;
padding-left: 0.5em;
}
+
+/* IE6 sets dynamically generated links as visited. */
+div#toc a:visited { color: blue; }
</style>
<title>Everyday GIT With 20 Commands Or So</title>
</head>
@@ -263,25 +311,25 @@ div.exampleblock-content {
</div>
<div id="preamble">
<div class="sectionbody">
-<p><a href="#Basic Repository">[Basic Repository]</a> commands are needed by people who have a
+<div class="para"><p><a href="#Basic Repository">[Basic Repository]</a> commands are needed by people who have a
repository --- that is everybody, because every working tree of
-git is a repository.</p>
-<p>In addition, <a href="#Individual Developer (Standalone)">[Individual Developer (Standalone)]</a> commands are
+git is a repository.</p></div>
+<div class="para"><p>In addition, <a href="#Individual Developer (Standalone)">[Individual Developer (Standalone)]</a> commands are
essential for anybody who makes a commit, even for somebody who
-works alone.</p>
-<p>If you work with other people, you will need commands listed in
-the <a href="#Individual Developer (Participant)">[Individual Developer (Participant)]</a> section as well.</p>
-<p>People who play the <a href="#Integrator">[Integrator]</a> role need to learn some more
-commands in addition to the above.</p>
-<p><a href="#Repository Administration">[Repository Administration]</a> commands are for system
+works alone.</p></div>
+<div class="para"><p>If you work with other people, you will need commands listed in
+the <a href="#Individual Developer (Participant)">[Individual Developer (Participant)]</a> section as well.</p></div>
+<div class="para"><p>People who play the <a href="#Integrator">[Integrator]</a> role need to learn some more
+commands in addition to the above.</p></div>
+<div class="para"><p><a href="#Repository Administration">[Repository Administration]</a> commands are for system
administrators who are responsible for the care and feeding
-of git repositories.</p>
+of git repositories.</p></div>
</div>
</div>
-<h2>Basic Repository<a id="Basic Repository"></a></h2>
+<h2 id="_basic_repository_a_id_basic_repository_a">Basic Repository<a id="Basic Repository"></a></h2>
<div class="sectionbody">
-<p>Everybody uses these commands to maintain git repositories.</p>
-<ul>
+<div class="para"><p>Everybody uses these commands to maintain git repositories.</p></div>
+<div class="ilist"><ul>
<li>
<p>
<a href="git-init.html">git-init(1)</a> or <a href="git-clone.html">git-clone(1)</a> to create a
@@ -299,9 +347,9 @@ of git repositories.</p>
repack and prune.
</p>
</li>
-</ul>
-<h3>Examples</h3>
-<dl>
+</ul></div>
+<h3 id="_examples">Examples</h3><div style="clear:left"></div>
+<div class="vlist"><dl>
<dt>
Check health and remove cruft.
</dt>
@@ -312,7 +360,7 @@ Check health and remove cruft.
$ git count-objects <b>(2)</b>
$ git gc <b>(3)</b></tt></pre>
</div></div>
-<ol>
+<div class="colist"><ol>
<li>
<p>
running without <tt>--full</tt> is usually cheap and assures the
@@ -330,7 +378,7 @@ disk space is wasted by not repacking.
repacks the local repository and performs other housekeeping tasks.
</p>
</li>
-</ol>
+</ol></div>
</dd>
<dt>
Repack a small project into single pack.
@@ -340,23 +388,23 @@ Repack a small project into single pack.
<div class="content">
<pre><tt>$ git gc <b>(1)</b></tt></pre>
</div></div>
-<ol>
+<div class="colist"><ol>
<li>
<p>
pack all the objects reachable from the refs into one pack,
then remove the other packs.
</p>
</li>
-</ol>
+</ol></div>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>Individual Developer (Standalone)<a id="Individual Developer (Standalone)"></a></h2>
+<h2 id="_individual_developer_standalone_a_id_individual_developer_standalone_a">Individual Developer (Standalone)<a id="Individual Developer (Standalone)"></a></h2>
<div class="sectionbody">
-<p>A standalone individual developer does not exchange patches with
+<div class="para"><p>A standalone individual developer does not exchange patches with
other people, and works alone in a single repository, using the
-following commands.</p>
-<ul>
+following commands.</p></div>
+<div class="ilist"><ul>
<li>
<p>
<a href="git-show-branch.html">git-show-branch(1)</a> to see where you are.
@@ -410,9 +458,9 @@ following commands.</p>
<a href="git-tag.html">git-tag(1)</a> to mark known point.
</p>
</li>
-</ul>
-<h3>Examples</h3>
-<dl>
+</ul></div>
+<h3 id="_examples_2">Examples</h3><div style="clear:left"></div>
+<div class="vlist"><dl>
<dt>
Use a tarball as a starting point for a new repository.
</dt>
@@ -426,7 +474,7 @@ $ git add . <b>(1)</b>
$ git commit -m "import of frotz source tree."
$ git tag v2.43 <b>(2)</b></tt></pre>
</div></div>
-<ol>
+<div class="colist"><ol>
<li>
<p>
add everything under the current directory.
@@ -437,7 +485,7 @@ add everything under the current directory.
make a lightweight, unannotated tag.
</p>
</li>
-</ol>
+</ol></div>
</dd>
<dt>
Create a topic branch and develop.
@@ -462,7 +510,7 @@ $ git merge alsa-audio <b>(10)</b>
$ git log --since='3 days ago' <b>(11)</b>
$ git log v2.43.. curses/ <b>(12)</b></tt></pre>
</div></div>
-<ol>
+<div class="colist"><ol>
<li>
<p>
create a new topic branch.
@@ -528,16 +576,16 @@ view only the changes that touch what's in <tt>curses/</tt>
directory, since <tt>v2.43</tt> tag.
</p>
</li>
-</ol>
+</ol></div>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>Individual Developer (Participant)<a id="Individual Developer (Participant)"></a></h2>
+<h2 id="_individual_developer_participant_a_id_individual_developer_participant_a">Individual Developer (Participant)<a id="Individual Developer (Participant)"></a></h2>
<div class="sectionbody">
-<p>A developer working as a participant in a group project needs to
+<div class="para"><p>A developer working as a participant in a group project needs to
learn how to communicate with others, and uses these commands in
-addition to the ones needed by a standalone developer.</p>
-<ul>
+addition to the ones needed by a standalone developer.</p></div>
+<div class="ilist"><ul>
<li>
<p>
<a href="git-clone.html">git-clone(1)</a> from the upstream to prime your local
@@ -562,9 +610,9 @@ addition to the ones needed by a standalone developer.</p>
you adopt Linux kernel-style public forum workflow.
</p>
</li>
-</ul>
-<h3>Examples</h3>
-<dl>
+</ul></div>
+<h3 id="_examples_3">Examples</h3><div style="clear:left"></div>
+<div class="vlist"><dl>
<dt>
Clone the upstream and work on it. Feed changes to upstream.
</dt>
@@ -582,7 +630,7 @@ $ git reset --hard ORIG_HEAD <b>(6)</b>
$ git gc <b>(7)</b>
$ git fetch --tags <b>(8)</b></tt></pre>
</div></div>
-<ol>
+<div class="colist"><ol>
<li>
<p>
repeat as needed.
@@ -627,7 +675,7 @@ from time to time, obtain official tags from the <tt>origin</tt>
and store them under <tt>.git/refs/tags/</tt>.
</p>
</li>
-</ol>
+</ol></div>
</dd>
<dt>
Push into another repository.
@@ -651,7 +699,7 @@ mothership$ cd frotz
mothership$ git checkout master
mothership$ git merge satellite/master <b>(5)</b></tt></pre>
</div></div>
-<ol>
+<div class="colist"><ol>
<li>
<p>
mothership machine has a frotz repository under your home
@@ -685,7 +733,7 @@ on mothership machine, merge the work done on the satellite
machine into the master branch.
</p>
</li>
-</ol>
+</ol></div>
</dd>
<dt>
Branch off of a specific tag.
@@ -699,7 +747,7 @@ $ git checkout master
$ git format-patch -k -m --stdout v2.6.14..private2.6.14 |
git am -3 -k <b>(2)</b></tt></pre>
</div></div>
-<ol>
+<div class="colist"><ol>
<li>
<p>
create a private branch based on a well known (but somewhat behind)
@@ -712,17 +760,17 @@ forward port all changes in <tt>private2.6.14</tt> branch to <tt>master</tt> bra
without a formal "merging".
</p>
</li>
-</ol>
+</ol></div>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>Integrator<a id="Integrator"></a></h2>
+<h2 id="_integrator_a_id_integrator_a">Integrator<a id="Integrator"></a></h2>
<div class="sectionbody">
-<p>A fairly central person acting as the integrator in a group
+<div class="para"><p>A fairly central person acting as the integrator in a group
project receives changes made by others, reviews and integrates
them and publishes the result for others to use, using these
-commands in addition to the ones needed by participants.</p>
-<ul>
+commands in addition to the ones needed by participants.</p></div>
+<div class="ilist"><ul>
<li>
<p>
<a href="git-am.html">git-am(1)</a> to apply patches e-mailed in from your
@@ -750,9 +798,9 @@ commands in addition to the ones needed by participants.</p>
<a href="git-push.html">git-push(1)</a> to publish the bleeding edge.
</p>
</li>
-</ul>
-<h3>Examples</h3>
-<dl>
+</ul></div>
+<h3 id="_examples_4">Examples</h3><div style="clear:left"></div>
+<div class="vlist"><dl>
<dt>
My typical GIT day.
</dt>
@@ -780,7 +828,7 @@ $ git fetch ko &amp;&amp; git show-branch master maint 'tags/ko-*' <b>(11)</b>
$ git push ko <b>(12)</b>
$ git push ko v0.99.9x <b>(13)</b></tt></pre>
</div></div>
-<ol>
+<div class="colist"><ol>
<li>
<p>
see what I was in the middle of doing, if any.
@@ -853,9 +901,9 @@ Push: next
Push: +pu
Push: maint</tt></pre>
</div></div>
-<p>In the output from <tt>git show-branch</tt>, <tt>master</tt> should have
+<div class="para"><p>In the output from <tt>git show-branch</tt>, <tt>master</tt> should have
everything <tt>ko-master</tt> has, and <tt>next</tt> should have
-everything <tt>ko-next</tt> has.</p>
+everything <tt>ko-next</tt> has.</p></div>
</li>
<li>
<p>
@@ -867,15 +915,15 @@ push out the bleeding edge.
push the tag out, too.
</p>
</li>
-</ol>
+</ol></div>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>Repository Administration<a id="Repository Administration"></a></h2>
+<h2 id="_repository_administration_a_id_repository_administration_a">Repository Administration<a id="Repository Administration"></a></h2>
<div class="sectionbody">
-<p>A repository administrator uses the following tools to set up
-and maintain access to the repository by developers.</p>
-<ul>
+<div class="para"><p>A repository administrator uses the following tools to set up
+and maintain access to the repository by developers.</p></div>
+<div class="ilist"><ul>
<li>
<p>
<a href="git-daemon.html">git-daemon(1)</a> to allow anonymous download from
@@ -888,11 +936,11 @@ and maintain access to the repository by developers.</p>
for shared central repository users.
</p>
</li>
-</ul>
-<p><a href="howto/update-hook-example.txt">update hook howto</a> has a good
-example of managing a shared central repository.</p>
-<h3>Examples</h3>
-<dl>
+</ul></div>
+<div class="para"><p><a href="howto/update-hook-example.txt">update hook howto</a> has a good
+example of managing a shared central repository.</p></div>
+<h3 id="_examples_5">Examples</h3><div style="clear:left"></div>
+<div class="vlist"><dl>
<dt>
We assume the following in /etc/services
</dt>
@@ -913,7 +961,7 @@ Run git-daemon to serve /pub/scm from inetd.
git stream tcp nowait nobody \
/usr/bin/git-daemon git-daemon --inetd --export-all /pub/scm</tt></pre>
</div></div>
-<p>The actual configuration line should be on one line.</p>
+<div class="para"><p>The actual configuration line should be on one line.</p></div>
</dd>
<dt>
Run git-daemon to serve /pub/scm from xinetd.
@@ -937,8 +985,8 @@ service git
log_on_failure += USERID
}</tt></pre>
</div></div>
-<p>Check your xinetd(8) documentation and setup, this is from a Fedora system.
-Others might be different.</p>
+<div class="para"><p>Check your xinetd(8) documentation and setup, this is from a Fedora system.
+Others might be different.</p></div>
</dd>
<dt>
Give push/pull only access to developers.
@@ -954,7 +1002,7 @@ david:x:1003:1003::/home/david:/usr/bin/git-shell
$ grep git /etc/shells <b>(2)</b>
/usr/bin/git-shell</tt></pre>
</div></div>
-<ol>
+<div class="colist"><ol>
<li>
<p>
log-in shell is set to /usr/bin/git-shell, which does not
@@ -968,7 +1016,7 @@ in many distributions /etc/shells needs to list what is used
as the login shell.
</p>
</li>
-</ol>
+</ol></div>
</dd>
<dt>
CVS-style shared repository.
@@ -997,7 +1045,7 @@ refs/heads/master alice\|cindy
refs/heads/doc-update bob
refs/tags/v[0-9]* david</tt></pre>
</div></div>
-<ol>
+<div class="colist"><ol>
<li>
<p>
place the developers into the same git group.
@@ -1021,7 +1069,7 @@ david is the release manager and is the only person who can
create and push version tags.
</p>
</li>
-</ol>
+</ol></div>
</dd>
<dt>
HTTP server to support dumb protocol transfer.
@@ -1033,7 +1081,7 @@ HTTP server to support dumb protocol transfer.
dev$ ftp user@isp.example.com <b>(2)</b>
ftp&gt; cp -r .git /home/user/myproject.git</tt></pre>
</div></div>
-<ol>
+<div class="colist"><ol>
<li>
<p>
make sure your info/refs and objects/info/packs are up-to-date
@@ -1044,13 +1092,13 @@ make sure your info/refs and objects/info/packs are up-to-date
upload to public HTTP server hosted by your ISP.
</p>
</li>
-</ol>
+</ol></div>
</dd>
-</dl>
+</dl></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 02-Jul-2008 03:02:14 UTC
+Last updated 2008-09-19 06:33:25 UTC
</div>
</div>
</body>