diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-07-07 21:53:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-07-07 21:53:22 +0000 |
| commit | 7a4a283105c6ac21fcd7df88cf6a698281c2cd19 (patch) | |
| tree | 9f36d659a94bca1891c86eb4cc9d7cb975806743 /git-rerere.html | |
| parent | 330aae6bbe14d97917b66994484cabd0307d1873 (diff) | |
| download | git-htmldocs-7a4a283105c6ac21fcd7df88cf6a698281c2cd19.tar.gz | |
Autogenerated HTML docs for v1.5.3-rc0-63-gc956
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 7caf338ce..408717023 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -289,7 +289,7 @@ results and applying the previously recorded hand resolution.</p> <td class="icon">
<div class="title">Note</div>
</td>
-<td class="content">You need to create <tt>$GIT_DIR/rr-cache</tt> directory to enable this
+<td class="content">You need to set the config variable rerere.enabled to enable this
command.</td>
</tr></table>
</div>
@@ -444,7 +444,7 @@ records it if it is a new conflict, or reuses the earlier hand resolve when it is not. <tt>git-commit</tt> also invokes <tt>git-rerere</tt>
when recording a merge result. What this means is that you do
not have to do anything special yourself (Note: you still have
-to create <tt>$GIT_DIR/rr-cache</tt> directory to enable this command).</p>
+to set the config variable rerere.enabled to enable this command).</p>
<p>In our example, when you did the test merge, the manual
resolution is recorded, and it will be reused when you do the
actual merge later with updated master and topic branch, as long
@@ -481,7 +481,7 @@ conflict.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 16-Jun-2007 09:49:19 UTC
+Last updated 07-Jul-2007 21:52:19 UTC
</div>
</div>
</body>
|