diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-23 14:32:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-23 14:32:46 -0700 |
| commit | 322c6244651c408d924f71f73effd8ed833916d3 (patch) | |
| tree | 6e8cf8d283e2a923cc330b4b64eeb3c972341edd /git-rerere.html | |
| parent | 0762262193bb8a218def4fd749a68476d5337b5d (diff) | |
| download | git-htmldocs-322c6244651c408d924f71f73effd8ed833916d3.tar.gz | |
Autogenerated HTML docs for v2.3.4-263-gf53fc
Diffstat (limited to 'git-rerere.html')
| -rw-r--r-- | git-rerere.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rerere.html b/git-rerere.html index 18bb84c71..d9dcd4c6e 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -839,7 +839,7 @@ Prune records of conflicted merges that occurred a long time ago. By default, unresolved conflicts older
than 15 days and resolved conflicts older than 60
days are pruned. These defaults are controlled via the
-<code>gc.rerereunresolved</code> and <code>gc.rerereresolved</code> configuration
+<code>gc.rerereUnresolved</code> and <code>gc.rerereResolved</code> configuration
variables respectively.
</p>
</dd>
@@ -983,7 +983,7 @@ conflict.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2015-03-23 14:31:16 PDT
</div>
</div>
</body>
|