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.txt | |
| 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.txt')
| -rw-r--r-- | git-fmt-merge-msg.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt index 32aff954a..3a0f55ec8 100644 --- a/git-fmt-merge-msg.txt +++ b/git-fmt-merge-msg.txt @@ -53,6 +53,11 @@ 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 |