diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-17 16:34:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-17 16:34:02 -0700 |
| commit | 3d1b5a1ebc2e4d9c3323a8f2b1fac732562968b5 (patch) | |
| tree | 49e1d04b52edbaa0b3d2fc549ad3cdbe30f9e1ee /git-merge.html | |
| parent | ba7fe50148ec50de8394e1fe0f672c47bf6d4c17 (diff) | |
| download | git-htmldocs-3d1b5a1ebc2e4d9c3323a8f2b1fac732562968b5.tar.gz | |
Autogenerated HTML docs for v1.8.3-rc3
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/git-merge.html b/git-merge.html index 97e8da2dd..566139bc9 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1022,10 +1022,7 @@ used to give a good default for automated <em>git merge</em> invocations.</p></div>
</dd>
<dt class="hdlist1">
---rerere-autoupdate
-</dt>
-<dt class="hdlist1">
---no-rerere-autoupdate
+--[no-]rerere-autoupdate
</dt>
<dd>
<p>
@@ -1799,7 +1796,7 @@ branch.<name>.mergeoptions <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-03-28 16:23:57 PDT
+Last updated 2013-05-17 16:33:07 PDT
</div>
</div>
</body>
|