summaryrefslogtreecommitdiffstats
path: root/git-rerere.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-04-25 19:12:27 +0900
committerJunio C Hamano <gitster@pobox.com>2019-04-25 19:12:27 +0900
commit2ba14716c3b8d8081480683846aefbc1d2abe0db (patch)
tree26796b7b6c67263fc7a895282813fba914033b2c /git-rerere.html
parentb551377cb5b53a9d5872eeaa46cd5b3a0a661435 (diff)
downloadgit-htmldocs-2ba14716c3b8d8081480683846aefbc1d2abe0db.tar.gz
Autogenerated HTML docs for v2.21.0-777-g83232e
Diffstat (limited to 'git-rerere.html')
-rw-r--r--git-rerere.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rerere.html b/git-rerere.html
index e62bd9740..cfa6c82ab 100644
--- a/git-rerere.html
+++ b/git-rerere.html
@@ -770,7 +770,7 @@ hand resolutions to their corresponding automerge results.</p></div>
<td class="icon">
<div class="title">Note</div>
</td>
-<td class="content">You need to set the configuration variable rerere.enabled in order to
+<td class="content">You need to set the configuration variable <code>rerere.enabled</code> in order to
enable this command.</td>
</tr></table>
</div>
@@ -990,7 +990,7 @@ setting in <a href="gitattributes.html">gitattributes(5)</a> can be used.</p></d
<div id="footer">
<div id="footer-text">
Last updated
- 2018-09-18 07:45:24 JST
+ 2019-04-25 19:09:28 JST
</div>
</div>
</body>