diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-12-05 10:59:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-12-05 10:59:48 +0000 |
| commit | e0facb91f036fe57e82a8d55f86a0a387b8562e6 (patch) | |
| tree | f2692d484243f4610b954bfafa1b9707d8482d5a /git-rerere.html | |
| parent | 58256872f2578443b3c8aff87ad0304e6b497b1d (diff) | |
| download | git-htmldocs-e0facb91f036fe57e82a8d55f86a0a387b8562e6.tar.gz | |
Autogenerated HTML docs for v1.5.3.7-1066-g7a4a
Diffstat (limited to 'git-rerere.html')
| -rw-r--r-- | git-rerere.html | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/git-rerere.html b/git-rerere.html index 980855021..08efed8f8 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -284,15 +284,6 @@ to the "release" branch, or sent out and accepted upstream).</p> automerge results and corresponding hand-resolve results on the
initial manual merge, and later by noticing the same automerge
results and applying the previously recorded hand resolution.</p>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">You need to set the config variable rerere.enabled to enable this
-command.</td>
-</tr></table>
-</div>
</div>
<h2>COMMANDS</h2>
<div class="sectionbody">
@@ -481,7 +472,7 @@ conflict.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 14-Nov-2007 12:11:45 UTC
+Last updated 05-Dec-2007 10:59:13 UTC
</div>
</div>
</body>
|