diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-09-30 00:04:34 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-09-30 00:04:34 +0000 |
| commit | 3b4609d029e2db42b5154f019facecee49196bf0 (patch) | |
| tree | 6d059b8455a973760f1680791fbdf8c453fe387e /git-fmt-merge-msg.html | |
| parent | 442206cbc570d6bc05423bd8a54db5f06d740c65 (diff) | |
| download | git-htmldocs-3b4609d029e2db42b5154f019facecee49196bf0.tar.gz | |
Autogenerated HTML docs for v1.7.3.1-45-g9855
Diffstat (limited to 'git-fmt-merge-msg.html')
| -rw-r--r-- | git-fmt-merge-msg.html | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index 6d3fa1b0e..6ed65157a 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html @@ -321,8 +321,8 @@ git-fmt-merge-msg(1) Manual Page <h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git fmt-merge-msg</em> [-m <message>] [--log | --no-log] <$GIT_DIR/FETCH_HEAD
-<em>git fmt-merge-msg</em> [-m <message>] [--log | --no-log] -F <file></div></div>
+<div class="content"><em>git fmt-merge-msg</em> [-m <message>] [--log[=<n>] | --no-log] <$GIT_DIR/FETCH_HEAD
+<em>git fmt-merge-msg</em> [-m <message>] [--log[=<n>] | --no-log] -F <file></div></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
@@ -336,13 +336,15 @@ automatically invoking <em>git merge</em>.</p></div> <div class="sectionbody">
<div class="vlist"><dl>
<dt>
---log
+--log[=<n>]
</dt>
<dd>
<p>
In addition to branch names, populate the log message with
one-line descriptions from the actual commits that are being
- merged.
+ merged. At most <n> commits from each merge parent will be
+ used (20 if <n> is omitted). This overrides the <tt>merge.log</tt>
+ configuration variable.
</p>
</dd>
<dt>
@@ -400,8 +402,10 @@ merge.log </dt>
<dd>
<p>
- Whether to include summaries of merged commits in newly
- merge commit messages. False by default.
+ In addition to branch names, populate the log message with at
+ most the specified number of one-line descriptions from the
+ actual commits that are being merged. Defaults to false, and
+ true is a synoym for 20.
</p>
</dd>
<dt>
@@ -433,7 +437,7 @@ merge.summary </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-18 23:56:43 UTC
+Last updated 2010-09-30 00:02:57 UTC
</div>
</div>
</body>
|