undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  README: point to Documentation/SubmittingPatches
  Document merge.branchdesc configuration variable
This commit is contained in:
Junio C Hamano 2012-02-23 13:29:10 -08:00
commit 6a609823f4
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-fmt-merge-msg.txt
View File

@ -53,6 +53,11 @@ OPTIONS
CONFIGURATION 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:: merge.log::
In addition to branch names, populate the log message with at In addition to branch names, populate the log message with at
most the specified number of one-line descriptions from the most the specified number of one-line descriptions from the

10
README
View File

@ -42,10 +42,12 @@ including full documentation and Git related tools.
The user discussion and development of Git take place on the Git The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org. To subscribe requests, comments and patches to git@vger.kernel.org (read
to the list, send an email with just "subscribe git" in the body to Documentation/SubmittingPatches for instructions on patch submission).
majordomo@vger.kernel.org. The mailing list archives are available at To subscribe to the list, send an email with just "subscribe git" in
http://marc.theaimsgroup.com/?l=git and other archival sites. 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 The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and git.git (stable)" and "What's cooking in git.git (topics)" and