diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-23 21:29:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-23 21:29:10 (GMT) |
| commit | 6a609823f449e88a3e6c7f3ce5c980ccf73edcb0 (patch) | |
| tree | d83ff752694fca22c16e8f4e296b2ec20b3d0a88 /Documentation | |
| parent | d46f476cb26f647e4571b5ccfba516d30ee06c63 (diff) | |
| parent | 07f050c9996cbda2af8d42996ebd349dcdb4c28d (diff) | |
| download | git-6a609823f449e88a3e6c7f3ce5c980ccf73edcb0.zip git-6a609823f449e88a3e6c7f3ce5c980ccf73edcb0.tar.gz git-6a609823f449e88a3e6c7f3ce5c980ccf73edcb0.tar.bz2 | |
Merge branch 'maint'
* maint:
README: point to Documentation/SubmittingPatches
Document merge.branchdesc configuration variable
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-fmt-merge-msg.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index 32aff95..3a0f55e 100644 --- a/Documentation/git-fmt-merge-msg.txt +++ b/Documentation/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 |