diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
| commit | ba4b9286c25f18c7ebbb809ee5732a7810377ab6 (patch) | |
| tree | 390507328a7564b65dc803683c34235700b97409 /git-rebase.html | |
| parent | 05bf9c54a827e48b2b576488f5170a3490b5180e (diff) | |
| download | git-htmldocs-ba4b9286c25f18c7ebbb809ee5732a7810377ab6.tar.gz | |
Autogenerated HTML docs for v1.5.6.2-212-g08b5
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 290 |
1 files changed, 169 insertions, 121 deletions
diff --git a/git-rebase.html b/git-rebase.html index 564948b37..a2905d502 100644 --- a/git-rebase.html +++ b/git-rebase.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,7 +245,33 @@ td.hlist2 { @media print {
div#footer-badges { display: none; }
}
-include::./stylesheets/xhtml11-manpage.css[]
+
+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;
+}
+include1::./stylesheets/xhtml11-manpage.css[]
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -255,6 +300,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>git-rebase(1)</title>
</head>
@@ -279,74 +327,74 @@ git-rebase(1) Manual Page [--onto <newbase>] <upstream> [<branch>]
<em>git rebase</em> --continue | --skip | --abort</div></div>
</div>
-<h2>DESCRIPTION</h2>
+<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<p>If <branch> is specified, <tt>git-rebase</tt> will perform an automatic
+<div class="para"><p>If <branch> is specified, <em>git-rebase</em> will perform an automatic
<tt>git checkout <branch></tt> before doing anything else. Otherwise
-it remains on the current branch.</p>
-<p>All changes made by commits in the current branch but that are not
+it remains on the current branch.</p></div>
+<div class="para"><p>All changes made by commits in the current branch but that are not
in <upstream> are saved to a temporary area. This is the same set
-of commits that would be shown by <tt>git log <upstream>..HEAD</tt>.</p>
-<p>The current branch is reset to <upstream>, or <newbase> if the
+of commits that would be shown by <tt>git log <upstream>..HEAD</tt>.</p></div>
+<div class="para"><p>The current branch is reset to <upstream>, or <newbase> if the
--onto option was supplied. This has the exact same effect as
-<tt>git reset --hard <upstream></tt> (or <newbase>).</p>
-<p>The commits that were previously saved into the temporary area are
+<tt>git reset --hard <upstream></tt> (or <newbase>).</p></div>
+<div class="para"><p>The commits that were previously saved into the temporary area are
then reapplied to the current branch, one by one, in order. Note that
any commits in HEAD which introduce the same textual changes as a commit
in HEAD..<upstream> are omitted (i.e., a patch already accepted upstream
-with a different commit message or timestamp will be skipped).</p>
-<p>It is possible that a merge failure will prevent this process from being
+with a different commit message or timestamp will be skipped).</p></div>
+<div class="para"><p>It is possible that a merge failure will prevent this process from being
completely automatic. You will have to resolve any such merge failure
and run <tt>git rebase --continue</tt>. Another option is to bypass the commit
that caused the merge failure with <tt>git rebase --skip</tt>. To restore the
original <branch> and remove the .dotest working files, use the command
-<tt>git rebase --abort</tt> instead.</p>
-<p>Assume the following history exists and the current branch is "topic":</p>
+<tt>git rebase --abort</tt> instead.</p></div>
+<div class="para"><p>Assume the following history exists and the current branch is "topic":</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> A---B---C topic
/
D---E---F---G master</tt></pre>
</div></div>
-<p>From this point, the result of either of the following commands:</p>
+<div class="para"><p>From this point, the result of either of the following commands:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git rebase master
git rebase master topic</tt></pre>
</div></div>
-<p>would be:</p>
+<div class="para"><p>would be:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> A'--B'--C' topic
/
D---E---F---G master</tt></pre>
</div></div>
-<p>The latter form is just a short-hand of <tt>git checkout topic</tt>
-followed by <tt>git rebase master</tt>.</p>
-<p>If the upstream branch already contains a change you have made (e.g.,
+<div class="para"><p>The latter form is just a short-hand of <tt>git checkout topic</tt>
+followed by <tt>git rebase master</tt>.</p></div>
+<div class="para"><p>If the upstream branch already contains a change you have made (e.g.,
because you mailed a patch which was applied upstream), then that commit
will be skipped. For example, running <tt>git rebase master</tt> on the
following history (in which A' and A introduce the same set of changes,
-but have different committer information):</p>
+but have different committer information):</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> A---B---C topic
/
D---E---A'---F master</tt></pre>
</div></div>
-<p>will result in:</p>
+<div class="para"><p>will result in:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> B'---C' topic
/
D---E---A'---F master</tt></pre>
</div></div>
-<p>Here is how you would transplant a topic branch based on one
+<div class="para"><p>Here is how you would transplant a topic branch based on one
branch to another, to pretend that you forked the topic branch
-from the latter branch, using <tt>rebase --onto</tt>.</p>
-<p>First let's assume your <em>topic</em> is based on branch <em>next</em>.
+from the latter branch, using <tt>rebase --onto</tt>.</p></div>
+<div class="para"><p>First let's assume your <em>topic</em> is based on branch <em>next</em>.
For example feature developed in <em>topic</em> depends on some
-functionality which is found in <em>next</em>.</p>
+functionality which is found in <em>next</em>.</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> o---o---o---o---o master
@@ -355,9 +403,9 @@ functionality which is found in <em>next</em>.</p> \
o---o---o topic</tt></pre>
</div></div>
-<p>We would want to make <em>topic</em> forked from branch <em>master</em>,
+<div class="para"><p>We would want to make <em>topic</em> forked from branch <em>master</em>,
for example because the functionality <em>topic</em> branch depend on
-got merged into more stable <em>master</em> branch, like this:</p>
+got merged into more stable <em>master</em> branch, like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> o---o---o---o---o master
@@ -366,13 +414,13 @@ got merged into more stable <em>master</em> branch, like this:</p> \
o---o---o---o---o next</tt></pre>
</div></div>
-<p>We can get this using the following command:</p>
+<div class="para"><p>We can get this using the following command:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git rebase --onto master next topic</tt></pre>
</div></div>
-<p>Another example of --onto option is to rebase part of a
-branch. If we have the following situation:</p>
+<div class="para"><p>Another example of --onto option is to rebase part of a
+branch. If we have the following situation:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> H---I---J topicB
@@ -381,12 +429,12 @@ branch. If we have the following situation:</p> /
A---B---C---D master</tt></pre>
</div></div>
-<p>then the command</p>
+<div class="para"><p>then the command</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git rebase --onto master topicA topicB</tt></pre>
</div></div>
-<p>would result in:</p>
+<div class="para"><p>would result in:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> H'--I'--J' topicB
@@ -395,50 +443,50 @@ branch. If we have the following situation:</p> |/
A---B---C---D master</tt></pre>
</div></div>
-<p>This is useful when topicB does not depend on topicA.</p>
-<p>A range of commits could also be removed with rebase. If we have
-the following situation:</p>
+<div class="para"><p>This is useful when topicB does not depend on topicA.</p></div>
+<div class="para"><p>A range of commits could also be removed with rebase. If we have
+the following situation:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> E---F---G---H---I---J topicA</tt></pre>
</div></div>
-<p>then the command</p>
+<div class="para"><p>then the command</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git rebase --onto topicA~5 topicA~3 topicA</tt></pre>
</div></div>
-<p>would result in the removal of commits F and G:</p>
+<div class="para"><p>would result in the removal of commits F and G:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> E---H'---I'---J' topicA</tt></pre>
</div></div>
-<p>This is useful if F and G were flawed in some way, or should not be
+<div class="para"><p>This is useful if F and G were flawed in some way, or should not be
part of topicA. Note that the argument to --onto and the <upstream>
-parameter can be any valid commit-ish.</p>
-<p>In case of conflict, <tt>git-rebase</tt> will stop at the first problematic commit
-and leave conflict markers in the tree. You can use <tt>git-diff</tt> to locate
+parameter can be any valid commit-ish.</p></div>
+<div class="para"><p>In case of conflict, <em>git-rebase</em> will stop at the first problematic commit
+and leave conflict markers in the tree. You can use <em>git-diff</em> to locate
the markers (<<<<<<) and make edits to resolve the conflict. For each
file you edit, you need to tell git that the conflict has been resolved,
-typically this would be done with</p>
+typically this would be done with</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git add <filename></tt></pre>
</div></div>
-<p>After resolving the conflict manually and updating the index with the
-desired resolution, you can continue the rebasing process with</p>
+<div class="para"><p>After resolving the conflict manually and updating the index with the
+desired resolution, you can continue the rebasing process with</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git rebase --continue</tt></pre>
</div></div>
-<p>Alternatively, you can undo the <tt>git-rebase</tt> with</p>
+<div class="para"><p>Alternatively, you can undo the <em>git-rebase</em> with</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git rebase --abort</tt></pre>
</div></div>
</div>
-<h2>OPTIONS</h2>
+<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
<dt>
<newbase>
</dt>
@@ -515,8 +563,8 @@ desired resolution, you can continue the rebasing process with</p> Use the given merge strategy; can be supplied more than
once to specify them in the order they should be tried.
If there is no <tt>-s</tt> option, a built-in list of strategies
- is used instead (<tt>git-merge-recursive</tt> when merging a single
- head, <tt>git-merge-octopus</tt> otherwise). This implies --merge.
+ is used instead (<em>git-merge-recursive</em> when merging a single
+ head, <em>git-merge-octopus</em> otherwise). This implies --merge.
</p>
</dd>
<dt>
@@ -546,7 +594,7 @@ desired resolution, you can continue the rebasing process with</p> </dt>
<dd>
<p>
- This flag is passed to the <tt>git-apply</tt> program
+ This flag is passed to the <em>git-apply</em> program
(see <a href="git-apply.html">git-apply(1)</a>) that applies the patch.
</p>
</dd>
@@ -575,11 +623,11 @@ desired resolution, you can continue the rebasing process with</p> only works in interactive mode.
</p>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>MERGE STRATEGIES</h2>
+<h2 id="_merge_strategies">MERGE STRATEGIES</h2>
<div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
<dt>
resolve
</dt>
@@ -645,28 +693,28 @@ subtree ancestor tree.
</p>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>NOTES</h2>
+<h2 id="_notes">NOTES</h2>
<div class="sectionbody">
-<p>When you rebase a branch, you are changing its history in a way that
+<div class="para"><p>When you rebase a branch, you are changing its history in a way that
will cause problems for anyone who already has a copy of the branch
in their repository and tries to pull updates from you. You should
-understand the implications of using <em>git rebase</em> on a repository that
-you share.</p>
-<p>When the git rebase command is run, it will first execute a "pre-rebase"
+understand the implications of using <em>git-rebase</em> on a repository that
+you share.</p></div>
+<div class="para"><p>When the git-rebase command is run, it will first execute a "pre-rebase"
hook if one exists. You can use this hook to do sanity checks and
reject the rebase if it isn't appropriate. Please see the template
-pre-rebase hook script for an example.</p>
-<p>Upon completion, <branch> will be the current branch.</p>
+pre-rebase hook script for an example.</p></div>
+<div class="para"><p>Upon completion, <branch> will be the current branch.</p></div>
</div>
-<h2>INTERACTIVE MODE</h2>
+<h2 id="_interactive_mode">INTERACTIVE MODE</h2>
<div class="sectionbody">
-<p>Rebasing interactively means that you have a chance to edit the commits
+<div class="para"><p>Rebasing interactively means that you have a chance to edit the commits
which are rebased. You can reorder the commits, and you can
-remove them (weeding out bad or otherwise unwanted patches).</p>
-<p>The interactive mode is meant for this type of workflow:</p>
-<ol>
+remove them (weeding out bad or otherwise unwanted patches).</p></div>
+<div class="para"><p>The interactive mode is meant for this type of workflow:</p></div>
+<div class="olist"><ol>
<li>
<p>
have a wonderful idea
@@ -687,14 +735,14 @@ prepare a series for submission submit
</p>
</li>
-</ol>
-<p>where point 2. consists of several instances of</p>
-<ol class="olist2">
+</ol></div>
+<div class="para"><p>where point 2. consists of several instances of</p></div>
+<div class="olist2"><ol>
<li>
<p>
regular use
</p>
-<ol>
+<div class="olist"><ol>
<li>
<p>
finish something worthy of a commit
@@ -705,13 +753,13 @@ finish something worthy of a commit commit
</p>
</li>
-</ol>
+</ol></div>
</li>
<li>
<p>
independent fixup
</p>
-<ol>
+<div class="olist"><ol>
<li>
<p>
realize that something does not work
@@ -727,52 +775,52 @@ fix that commit it
</p>
</li>
-</ol>
+</ol></div>
</li>
-</ol>
-<p>Sometimes the thing fixed in b.2. cannot be amended to the not-quite
+</ol></div>
+<div class="para"><p>Sometimes the thing fixed in b.2. cannot be amended to the not-quite
perfect commit it fixes, because that commit is buried deeply in a
patch series. That is exactly what interactive rebase is for: use it
after plenty of "a"s and "b"s, by rearranging and editing
-commits, and squashing multiple commits into one.</p>
-<p>Start it with the last commit you want to retain as-is:</p>
+commits, and squashing multiple commits into one.</p></div>
+<div class="para"><p>Start it with the last commit you want to retain as-is:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git rebase -i <after-this-commit></tt></pre>
</div></div>
-<p>An editor will be fired up with all the commits in your current branch
+<div class="para"><p>An editor will be fired up with all the commits in your current branch
(ignoring merge commits), which come after the given commit. You can
reorder the commits in this list to your heart's content, and you can
-remove them. The list looks more or less like this:</p>
+remove them. The list looks more or less like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>pick deadbee The oneline of this commit
pick fa1afe1 The oneline of the next commit
...</tt></pre>
</div></div>
-<p>The oneline descriptions are purely for your pleasure; <tt>git-rebase</tt> will
+<div class="para"><p>The oneline descriptions are purely for your pleasure; <em>git-rebase</em> will
not look at them but at the commit names ("deadbee" and "fa1afe1" in this
-example), so do not delete or edit the names.</p>
-<p>By replacing the command "pick" with the command "edit", you can tell
-<tt>git-rebase</tt> to stop after applying that commit, so that you can edit
+example), so do not delete or edit the names.</p></div>
+<div class="para"><p>By replacing the command "pick" with the command "edit", you can tell
+<em>git-rebase</em> to stop after applying that commit, so that you can edit
the files and/or the commit message, amend the commit, and continue
-rebasing.</p>
-<p>If you want to fold two or more commits into one, replace the command
+rebasing.</p></div>
+<div class="para"><p>If you want to fold two or more commits into one, replace the command
"pick" with "squash" for the second and subsequent commit. If the
commits had different authors, it will attribute the squashed commit to
-the author of the first commit.</p>
-<p>In both cases, or when a "pick" does not succeed (because of merge
+the author of the first commit.</p></div>
+<div class="para"><p>In both cases, or when a "pick" does not succeed (because of merge
errors), the loop will stop to let you fix things, and you can continue
-the loop with <tt>git rebase --continue</tt>.</p>
-<p>For example, if you want to reorder the last 5 commits, such that what
+the loop with <tt>git rebase --continue</tt>.</p></div>
+<div class="para"><p>For example, if you want to reorder the last 5 commits, such that what
was HEAD~4 becomes the new HEAD. To achieve that, you would call
-<tt>git-rebase</tt> like this:</p>
+<em>git-rebase</em> like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git rebase -i HEAD~5</tt></pre>
</div></div>
-<p>And move the first patch to the end of the list.</p>
-<p>You might want to preserve merges, if you have a history like this:</p>
+<div class="para"><p>And move the first patch to the end of the list.</p></div>
+<div class="para"><p>You might want to preserve merges, if you have a history like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> X
@@ -781,20 +829,20 @@ was HEAD~4 becomes the new HEAD. To achieve that, you would call /
---o---O---P---Q</tt></pre>
</div></div>
-<p>Suppose you want to rebase the side branch starting at "A" to "Q". Make
-sure that the current HEAD is "B", and call</p>
+<div class="para"><p>Suppose you want to rebase the side branch starting at "A" to "Q". Make
+sure that the current HEAD is "B", and call</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git rebase -i -p --onto Q O</tt></pre>
</div></div>
</div>
-<h2>SPLITTING COMMITS</h2>
+<h2 id="_splitting_commits">SPLITTING COMMITS</h2>
<div class="sectionbody">
-<p>In interactive mode, you can mark commits with the action "edit". However,
-this does not necessarily mean that <tt>git-rebase</tt> expects the result of this
+<div class="para"><p>In interactive mode, you can mark commits with the action "edit". However,
+this does not necessarily mean that <em>git-rebase</em> expects the result of this
edit to be exactly one commit. Indeed, you can undo the commit, or you can
-add other commits. This can be used to split a commit into two:</p>
-<ul>
+add other commits. This can be used to split a commit into two:</p></div>
+<div class="ilist"><ul>
<li>
<p>
Start an interactive rebase with <tt>git rebase -i <commit>^</tt>, where
@@ -818,7 +866,7 @@ When it comes to editing that commit, execute <tt>git reset HEAD^</tt>. The <p>
Now add the changes to the index that you want to have in the first
commit. You can use <tt>git add</tt> (possibly interactively) or
- <tt>git-gui</tt> (or both) to do that.
+ <em>git-gui</em> (or both) to do that.
</p>
</li>
<li>
@@ -837,28 +885,28 @@ Repeat the last two steps until your working tree is clean. Continue the rebase with <tt>git rebase --continue</tt>.
</p>
</li>
-</ul>
-<p>If you are not absolutely sure that the intermediate revisions are
+</ul></div>
+<div class="para"><p>If you are not absolutely sure that the intermediate revisions are
consistent (they compile, pass the testsuite, etc.) you should use
-<tt>git-stash</tt> to stash away the not-yet-committed changes
-after each commit, test, and amend the commit if fixes are necessary.</p>
+<em>git-stash</em> to stash away the not-yet-committed changes
+after each commit, test, and amend the commit if fixes are necessary.</p></div>
</div>
-<h2>Authors</h2>
+<h2 id="_authors">Authors</h2>
<div class="sectionbody">
-<p>Written by Junio C Hamano <junkio@cox.net> and
-Johannes E. Schindelin <johannes.schindelin@gmx.de></p>
+<div class="para"><p>Written by Junio C Hamano <junkio@cox.net> and
+Johannes E. Schindelin <johannes.schindelin@gmx.de></p></div>
</div>
-<h2>Documentation</h2>
+<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
-<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
+<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>
</div>
-<h2>GIT</h2>
+<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<p>Part of the <a href="git.html">git(1)</a> suite</p>
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 02-Jul-2008 03:01:57 UTC
+Last updated 2008-07-06 05:16:57 UTC
</div>
</div>
</body>
|