Autogenerated HTML docs for v1.5.6.1-156-ge903b

1 files changed, 8 insertions, 8 deletions

diff --git a/git-rerere.html b/git-rerere.html
index 136ec0c0d..fab9d72ec 100644
--- a/git-rerere.html
+++ b/git-rerere.html
@@ -272,7 +272,7 @@ git-rerere(1) Manual Page
 </div>

 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

-<p><em>git-rerere</em> [clear|diff|status|gc]</p>

+<p><em>git rerere</em> [clear|diff|status|gc]</p>

 </div>

 <h2>DESCRIPTION</h2>

 <div class="sectionbody">

@@ -296,7 +296,7 @@ enable this command.</td>
 </div>

 <h2>COMMANDS</h2>

 <div class="sectionbody">

-<p>Normally, git-rerere is run without arguments or user-intervention.

+<p>Normally, <tt>git-rerere</tt> is run without arguments or user-intervention.

 However, it has several commands that allow it to interact with

 its working state.</p>

 <dl>

@@ -306,8 +306,8 @@ its working state.</p>
 <dd>

 <p>

 This resets the metadata used by rerere if a merge resolution is to be

-is aborted.  Calling <a href="git-am.html">git-am(1)</a> --skip or <a href="git-rebase.html">git-rebase(1)</a>

-[--skip|--abort] will automatically invoke this command.

+is aborted.  Calling <tt>git-am --skip</tt> or <tt>git-rebase [--skip|--abort]</tt>

+will automatically invoke this command.

 </p>

 </dd>

 <dt>

@@ -318,7 +318,7 @@ is aborted.  Calling <a href="git-am.html">git-am(1)</a> --skip or <a href="git-
 This displays diffs for the current state of the resolution.  It is

 useful for tracking what has changed while the user is resolving

 conflicts.  Additional arguments are passed directly to the system

-diff(1) command installed in PATH.

+<tt>diff</tt> command installed in PATH.

 </p>

 </dd>

 <dt>

@@ -421,7 +421,7 @@ same conflict you resolved when you created the test merge you
 blew away.  <tt>git-rerere</tt> command helps you to resolve this final

 conflicted merge using the information from your earlier hand

 resolve.</p>

-<p>Running <tt>git-rerere</tt> command immediately after a conflicted

+<p>Running the <tt>git-rerere</tt> command immediately after a conflicted

 automerge records the conflicted working tree files, with the

 usual conflict markers <tt>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</tt>, <tt>=======</tt>, and <tt>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</tt> in

 them.  Later, after you are done resolving the conflicts,

@@ -468,7 +468,7 @@ development on the topic branch:</p>
 up-to-date even before your topic is ready to be sent upstream.

 This would result in falling back to three-way merge, and it

 would conflict the same way the test merge you resolved earlier.

-<tt>git-rerere</tt> is run by <tt>git rebase</tt> to help you resolve this

+<tt>git-rerere</tt> is run by <tt>git-rebase</tt> to help you resolve this

 conflict.</p>

 </div>

 <h2>Author</h2>

@@ -481,7 +481,7 @@ conflict.</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 08-Jun-2008 01:34:06 UTC

+Last updated 02-Jul-2008 03:01:59 UTC

 </div>

 </div>

 </body>