diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-16 14:27:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-16 14:27:05 -0700 |
| commit | c7ca4424ea5644c6aa2c660a4a0726a75f8f2b84 (patch) | |
| tree | 4acab92baf40a8369e78a396ef343c75522345cd /Documentation/merge-config.txt | |
| parent | 412e63f0fd683addc380f9c65d05306bd2027039 (diff) | |
| parent | fc0aa395f3205a049e917d391e2afa93cda0c8af (diff) | |
| download | git-c7ca4424ea5644c6aa2c660a4a0726a75f8f2b84.tar.gz git-c7ca4424ea5644c6aa2c660a4a0726a75f8f2b84.tar.xz | |
Merge branch 'sg/merge-summary-config'
Doc updates.
* sg/merge-summary-config:
Documentation: include 'merge.branchdesc' for merge and config as well
Diffstat (limited to 'Documentation/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 8a0e52f8e..002ca58c2 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -26,11 +26,7 @@ merge.ff:: allowed (equivalent to giving the `--ff-only` option from the command line). -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.renameLimit:: The number of files to consider when performing rename detection |