diff options
author | Junio C Hamano <junio@kernel.org> | 2011-03-20 19:42:22 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2011-03-20 19:42:22 +0000 |
commit | d2c978f6be36b38127b58af46e28e3ae590b2d3b (patch) | |
tree | 88d8b45014f2b361e18b1aa71f48160ad7f5dc3f /git-rerere.html | |
parent | fa28cb14513978502ac466090afe34c3479fc90b (diff) | |
download | git-htmldocs-d2c978f6be36b38127b58af46e28e3ae590b2d3b.tar.gz |
Autogenerated HTML docs for v1.7.4.1-343-ga91df
Diffstat (limited to 'git-rerere.html')
-rw-r--r-- | git-rerere.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-rerere.html b/git-rerere.html index 756c507d5..23293d0f4 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -414,7 +414,7 @@ git-rerere(1) Manual Page </div>
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
-<div class="paragraph"><p><em>git rerere</em> [<em>clear</em>|<em>forget</em> [<pathspec>]|<em>diff</em>|<em>status</em>|<em>gc</em>]</p></div>
+<div class="paragraph"><p><em>git rerere</em> [<em>clear</em>|<em>forget</em> <pathspec>|<em>diff</em>|<em>status</em>|<em>gc</em>]</p></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
@@ -458,7 +458,7 @@ will automatically invoke this command. <dd>
<p>
This resets the conflict resolutions which rerere has recorded for the current
-conflict in <pathspec>. The <pathspec> is optional.
+conflict in <pathspec>.
</p>
</dd>
<dt class="hdlist1">
@@ -627,7 +627,7 @@ conflict.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-03-15 23:30:14 UTC
+Last updated 2011-03-20 19:41:42 UTC
</div>
</div>
</body>
|