diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-23 14:45:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-23 14:45:50 -0800 |
| commit | e0238c23e1e315e119307c52ea25d665422b0082 (patch) | |
| tree | a512e28c84eb8adf7bba202e312b24d0c3d21622 /git-fmt-merge-msg.html | |
| parent | 83002c9d9c8fcf2f6a4e643e324b14b88108e739 (diff) | |
| download | git-htmldocs-e0238c23e1e315e119307c52ea25d665422b0082.tar.gz | |
Autogenerated HTML docs for v1.7.9.2-262-gba998
Diffstat (limited to 'git-fmt-merge-msg.html')
| -rw-r--r-- | git-fmt-merge-msg.html | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index 9fec6f463..ee1bf95c4 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html @@ -662,6 +662,16 @@ automatically invoking <em>git merge</em>.</p></div> <div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
+merge.branchdesc
+</dt>
+<dd>
+<p>
+ In addition to branch names, populate the log message with
+ the branch description text associated with them. Defaults
+ to false.
+</p>
+</dd>
+<dt class="hdlist1">
merge.log
</dt>
<dd>
@@ -695,7 +705,7 @@ merge.summary <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-02-23 14:45:28 PDT
</div>
</div>
</body>
|