diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-23 13:29:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-23 13:29:10 -0800 |
| commit | 6a609823f449e88a3e6c7f3ce5c980ccf73edcb0 (patch) | |
| tree | d83ff752694fca22c16e8f4e296b2ec20b3d0a88 | |
| parent | d46f476cb26f647e4571b5ccfba516d30ee06c63 (diff) | |
| parent | 07f050c9996cbda2af8d42996ebd349dcdb4c28d (diff) | |
| download | git-6a609823f449e88a3e6c7f3ce5c980ccf73edcb0.tar.gz | |
Merge branch 'maint'
* maint:
README: point to Documentation/SubmittingPatches
Document merge.branchdesc configuration variable
| -rw-r--r-- | Documentation/git-fmt-merge-msg.txt | 5 | ||||
| -rw-r--r-- | README | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index 32aff954a2..3a0f55ec8e 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 @@ -42,10 +42,12 @@ including full documentation and Git related tools. The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature -requests, comments and patches to git@vger.kernel.org. To subscribe -to the list, send an email with just "subscribe git" in the body to -majordomo@vger.kernel.org. The mailing list archives are available at -http://marc.theaimsgroup.com/?l=git and other archival sites. +requests, comments and patches to git@vger.kernel.org (read +Documentation/SubmittingPatches for instructions on patch submission). +To subscribe to the list, send an email with just "subscribe git" in +the body to majordomo@vger.kernel.org. The mailing list archives are +available at http://marc.theaimsgroup.com/?l=git and other archival +sites. The messages titled "A note from the maintainer", "What's in git.git (stable)" and "What's cooking in git.git (topics)" and |