diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-01-15 08:31:10 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-01-15 08:31:10 +0000 |
| commit | 0e47b23874132a7fffde3f56c7c4f13c1f0b8cc4 (patch) | |
| tree | 224e0c2eaf36a7f35e3ef9cdc924a2f02ae3be06 /git-rerere.html | |
| parent | e77b015d156771d6b32769e7997c455adf9db4ab (diff) | |
| download | git-htmldocs-0e47b23874132a7fffde3f56c7c4f13c1f0b8cc4.tar.gz | |
Autogenerated HTML docs for v1.5.4-rc3-11-g4e67
Diffstat (limited to 'git-rerere.html')
| -rw-r--r-- | git-rerere.html | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/git-rerere.html b/git-rerere.html index 80f498aa8..a380aa3c0 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -284,6 +284,15 @@ 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 configuration variable rerere.enabled to
+enable this command.</td>
+</tr></table>
+</div>
</div>
<h2>COMMANDS</h2>
<div class="sectionbody">
@@ -472,7 +481,7 @@ conflict.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 07-Jan-2008 07:50:42 UTC
+Last updated 15-Jan-2008 08:30:41 UTC
</div>
</div>
</body>
|