diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-16 15:08:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-16 15:08:01 -0700 |
| commit | ce447ab917ea7f6b852fee7dfb18e4b24acc6bef (patch) | |
| tree | 9e7ac770c840a765f34b11e45e71ef81782c9cff /git-merge.html | |
| parent | 8c5d59493937c1482fea3e1c3d494aba0abe1005 (diff) | |
| download | git-htmldocs-ce447ab917ea7f6b852fee7dfb18e4b24acc6bef.tar.gz | |
Autogenerated HTML docs for v2.4.4-408-g16da5
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/git-merge.html b/git-merge.html index 644d551aa..1b6cb2fa4 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1600,6 +1600,16 @@ merge.ff </p>
</dd>
<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>
|