1 <!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3 <html xmlns=
"http://www.w3.org/1999/xhtml" xml:
lang=
"en">
5 <meta http-equiv=
"Content-Type" content=
"text/html; charset=UTF-8" />
6 <meta name=
"generator" content=
"AsciiDoc 8.2.5" />
7 <style type=
"text/css">
9 p
, li
, dt
, dd
, div
, pre
, h1
, h2
, h3
, h4
, h5
, h6
{
11 border: 1px solid red;
16 margin: 1em 5% 1em 5%;
21 text-decoration: underline
;
39 h1
, h2
, h3
, h4
, h5
, h6
{
41 font-family: sans-serif
;
48 border-bottom: 2px solid silver
;
66 border: 1px solid silver
;
81 font-family: sans-serif
;
88 font-family: sans-serif
;
92 font-family: sans-serif
;
94 border-top: 2px solid silver
;
100 padding-bottom: 0.5em;
104 padding-bottom: 0.5em;
108 div
.tableblock
, div
.imageblock
, div
.exampleblock
, div
.verseblock
,
109 div
.quoteblock
, div
.literalblock
, div
.listingblock
, div
.sidebarblock
,
110 div
.admonitionblock
{
113 margin-bottom: 1.5em;
115 div
.admonitionblock
{
117 margin-bottom: 2.5em;
120 div
.content
{ /* Block element content. */
124 /* Block element titles. */
125 div
.title
, caption
.title
{
126 font-family: sans-serif
;
130 margin-bottom: 0.5em;
136 td div
.title:first-child
{
139 div
.content div
.title:first-child
{
142 div
.content
+ div
.title
{
146 div
.sidebarblock
> div
.content
{
148 border: 1px solid silver
;
155 div
.listingblock
> div
.content
{
156 border: 1px solid silver
;
161 div
.quoteblock
> div
.content
{
168 div
.verseblock
+ div
.attribution
{
172 div
.admonitionblock
.icon
{
176 text-decoration: underline
;
178 padding-right: 0.5em;
180 div
.admonitionblock td
.content
{
182 border-left: 2px solid silver
;
185 div
.exampleblock
> div
.content
{
186 border-left: 2px solid silver
;
190 div
.verseblock div
.content
{
194 div
.imageblock div
.content
{ padding-left: 0; }
195 div
.imageblock img
{ border: 1px solid silver
; }
196 span
.image img
{ border-style: none
; }
200 margin-bottom: 0.8em;
212 list-style-position: outside
;
215 list-style-type: lower-alpha
;
218 div
.tableblock
> table
{
219 border: 3px solid
#527bbd;
222 font-family: sans-serif
;
231 margin-bottom: 0.8em;
239 padding-right: 0.8em;
246 div#footer-badges
{ display: none
; }
251 font-family: sans-serif
;
255 margin-bottom: 0.1em;
258 div
.toclevel1
, div
.toclevel2
, div
.toclevel3
, div
.toclevel4
{
274 include1::./stylesheets
/xhtml11-manpage
.css
[]
275 /* Workarounds for IE6's broken and incomplete CSS2. */
277 div
.sidebar-content
{
279 border: 1px solid silver
;
282 div
.sidebar-title
, div
.image-title
{
283 font-family: sans-serif
;
286 margin-bottom: 0.5em;
289 div
.listingblock div
.content
{
290 border: 1px solid silver
;
295 div
.quoteblock-content
{
299 div
.exampleblock-content
{
300 border-left: 2px solid silver
;
304 /* IE6 sets dynamically generated links as visited. */
305 div#toc
a:visited
{ color: blue
; }
307 <title>git-fmt-merge-msg(
1)
</title>
312 git-fmt-merge-msg(
1) Manual Page
315 <div class=
"sectionbody">
316 <p>git-fmt-merge-msg -
317 Produce a merge commit message
322 <div class=
"sectionbody">
323 <div class=
"verseblock">
324 <div class=
"content"><em>git fmt-merge-msg
</em> [--log | --no-log]
<$GIT_DIR/FETCH_HEAD
325 <em>git fmt-merge-msg
</em> [--log | --no-log] -F
<file
></div></div>
327 <h2 id=
"_description">DESCRIPTION
</h2>
328 <div class=
"sectionbody">
329 <div class=
"para"><p>Takes the list of merged objects on stdin and produces a suitable
330 commit message to be used for the merge commit, usually to be
331 passed as the
<em><merge-message
></em> argument of
<em>git-merge
</em>.
</p></div>
332 <div class=
"para"><p>This script is intended mostly for internal use by scripts
333 automatically invoking
<em>git-merge
</em>.
</p></div>
335 <h2 id=
"_options">OPTIONS
</h2>
336 <div class=
"sectionbody">
337 <div class=
"vlist"><dl>
343 In addition to branch names, populate the log message with
344 one-line descriptions from the actual commits that are being
353 Do not list one-line descriptions from the actual commits being
365 Synonyms to --log and --no-log; these are deprecated and will be
366 removed in the future.
377 Take the list of merged objects from
<file
> instead of
383 <h2 id=
"_configuration">CONFIGURATION
</h2>
384 <div class=
"sectionbody">
385 <div class=
"vlist"><dl>
391 Whether to include summaries of merged commits in newly
392 merge commit messages. False by default.
400 Synonym to
<tt>merge.log
</tt>; this is deprecated and will be removed in
406 <h2 id=
"_see_also">SEE ALSO
</h2>
407 <div class=
"sectionbody">
408 <div class=
"para"><p><a href=
"git-merge.html">git-merge(
1)
</a></p></div>
410 <h2 id=
"_author">Author
</h2>
411 <div class=
"sectionbody">
412 <div class=
"para"><p>Written by Junio C Hamano
<gitster@pobox.com
></p></div>
414 <h2 id=
"_documentation">Documentation
</h2>
415 <div class=
"sectionbody">
416 <div class=
"para"><p>Documentation by Petr Baudis, Junio C Hamano and the git-list
<git@vger.kernel.org
>.
</p></div>
418 <h2 id=
"_git">GIT
</h2>
419 <div class=
"sectionbody">
420 <div class=
"para"><p>Part of the
<a href=
"git.html">git(
1)
</a> suite
</p></div>
423 <div id=
"footer-text">
424 Last updated
2009-
07-
01 02:
30:
50 UTC