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-fmt-merge-msg.txt | |
| parent | 8c5d59493937c1482fea3e1c3d494aba0abe1005 (diff) | |
| download | git-htmldocs-ce447ab917ea7f6b852fee7dfb18e4b24acc6bef.tar.gz | |
Autogenerated HTML docs for v2.4.4-408-g16da5
Diffstat (limited to 'git-fmt-merge-msg.txt')
| -rw-r--r-- | git-fmt-merge-msg.txt | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt index bb1232a52..55a9a4b93 100644 --- a/git-fmt-merge-msg.txt +++ b/git-fmt-merge-msg.txt @@ -51,17 +51,7 @@ OPTIONS CONFIGURATION ------------- - -merge.branchdesc:: - In addition to branch names, populate the log message with - the branch description text associated with them. Defaults - to false. - -merge.log:: - 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 synonym for 20. +include::fmt-merge-msg-config.txt[] merge.summary:: Synonym to `merge.log`; this is deprecated and will be removed in |