diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-16 21:51:15 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 21:51:15 +0900 |
| commit | 6b7d215a58fcad73e1d989b5767c9d3b2ba6608b (patch) | |
| tree | 78de8e7c65f35106dfde60f0e6b4284f09e7f43f /git-merge.html | |
| parent | e0f71462e15863fa4b188b26e30db0155d52a946 (diff) | |
| download | git-htmldocs-6b7d215a58fcad73e1d989b5767c9d3b2ba6608b.tar.gz | |
Autogenerated HTML docs for v2.21.0-419-gffac5
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-merge.html b/git-merge.html index aa8b201ff..23ad15d83 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1093,7 +1093,10 @@ invocations. The automated message can include the branch description.</p></div> will be appended to the specified message.</p></div>
</dd>
<dt class="hdlist1">
---[no-]rerere-autoupdate
+--rerere-autoupdate
+</dt>
+<dt class="hdlist1">
+--no-rerere-autoupdate
</dt>
<dd>
<p>
@@ -1992,7 +1995,7 @@ branch.<name>.mergeOptions <div id="footer">
<div id="footer-text">
Last updated
- 2018-11-13 23:05:48 JST
+ 2019-04-16 21:48:13 JST
</div>
</div>
</body>
|