summaryrefslogtreecommitdiffstats
path: root/git-fmt-merge-msg.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-31 14:41:58 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-31 14:41:58 -0700
commitf2f28b10dcc3f853e652ebd6471d5a25bacb7b5a (patch)
tree69770f134f3b8ed5a2071767403661ed82634a5f /git-fmt-merge-msg.html
parent5c3af9ef805a7cca9e98a42a2dd9f986d88950a9 (diff)
downloadgit-htmldocs-f2f28b10dcc3f853e652ebd6471d5a25bacb7b5a.tar.gz
Autogenerated HTML docs for v2.11.0-rc0
Diffstat (limited to 'git-fmt-merge-msg.html')
-rw-r--r--git-fmt-merge-msg.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html
index 6a8fd05d6..db8cba1ca 100644
--- a/git-fmt-merge-msg.html
+++ b/git-fmt-merge-msg.html
@@ -865,10 +865,10 @@ merge.summary
<div class="sect1">
<h2 id="_example">EXAMPLE</h2>
<div class="sectionbody">
-<div class="openblock">
+<div class="listingblock">
<div class="content">
-<div class="paragraph"><p>$ git fetch origin master
-$ git fmt-merge-msg --log &lt;$GIT_DIR/FETCH_HEAD</p></div>
+<pre><code>$ git fetch origin master
+$ git fmt-merge-msg --log &lt;$GIT_DIR/FETCH_HEAD</code></pre>
</div></div>
<div class="paragraph"><p>Print a log message describing a merge of the "master" branch from
the "origin" remote.</p></div>
@@ -890,7 +890,7 @@ the "origin" remote.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2015-10-26 16:13:38 PDT
+Last updated 2016-10-31 14:39:16 PDT
</div>
</div>
</body>