summaryrefslogtreecommitdiffstats
path: root/git-fmt-merge-msg.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-26 16:14:30 -0700
committerJunio C Hamano <gitster@pobox.com>2015-10-26 16:14:30 -0700
commitdaf0aaecf41c91c2307b7a38218f6b2d37669ad1 (patch)
tree2032469465a7995a1ae1f8fbbb2345e32a2aa50e /git-fmt-merge-msg.html
parente265b5c6dbafc936b10575797cc098414af5b874 (diff)
downloadgit-htmldocs-daf0aaecf41c91c2307b7a38218f6b2d37669ad1.tar.gz
Autogenerated HTML docs for v2.6.2-307-g37023b
Diffstat (limited to 'git-fmt-merge-msg.html')
-rw-r--r--git-fmt-merge-msg.html16
1 files changed, 14 insertions, 2 deletions
diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html
index 723b36e2a..6a8fd05d6 100644
--- a/git-fmt-merge-msg.html
+++ b/git-fmt-merge-msg.html
@@ -748,7 +748,7 @@ git-fmt-merge-msg(1) Manual Page
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git fmt-merge-msg</em> [-m &lt;message&gt;] [--log[=&lt;n&gt;] | --no-log] &lt;$GIT_DIR/FETCH_HEAD
+<pre class="content"><em>git fmt-merge-msg</em> [-m &lt;message&gt;] [--log[=&lt;n&gt;] | --no-log]
<em>git fmt-merge-msg</em> [-m &lt;message&gt;] [--log[=&lt;n&gt;] | --no-log] -F &lt;file&gt;</pre>
<div class="attribution">
</div></div>
@@ -863,6 +863,18 @@ merge.summary
</div>
</div>
<div class="sect1">
+<h2 id="_example">EXAMPLE</h2>
+<div class="sectionbody">
+<div class="openblock">
+<div class="content">
+<div class="paragraph"><p>$ git fetch origin master
+$ git fmt-merge-msg --log &lt;$GIT_DIR/FETCH_HEAD</p></div>
+</div></div>
+<div class="paragraph"><p>Print a log message describing a merge of the "master" branch from
+the "origin" remote.</p></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-merge.html">git-merge(1)</a></p></div>
@@ -878,7 +890,7 @@ merge.summary
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2015-06-16 15:07:26 PDT
+Last updated 2015-10-26 16:13:38 PDT
</div>
</div>
</body>