diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-18 11:49:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-18 11:49:11 -0700 |
| commit | 288aa7534ae79eef03f79aaec355a7eedb08ddfa (patch) | |
| tree | 5316efce15cad491893eb91fbb87cecb767f0f17 /Documentation/config.txt | |
| parent | 54a3c67375384a38eae946b7996d226dbd9c26d4 (diff) | |
| parent | 0597ffa5ecff1b83f384357ab88afaf21838caa2 (diff) | |
| download | git-288aa7534ae79eef03f79aaec355a7eedb08ddfa.tar.gz | |
Merge branch 'fc/send-email-annotate'
Allows format-patch --cover-letter to be configurable; the most
notable is the "auto" mode to create cover-letter only for multi
patch series.
* fc/send-email-annotate:
rebase-am: explicitly disable cover-letter
format-patch: trivial cleanups
format-patch: add format.coverLetter configuration variable
log: update to OPT_BOOL
format-patch: refactor branch name calculation
format-patch: improve head calculation for cover-letter
send-email: make annotate configurable
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 3d750e0452..42b0f3ba42 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1109,6 +1109,11 @@ format.signoff:: the rights to submit this work under the same open source license. Please see the 'SubmittingPatches' document for further discussion. +format.coverLetter:: + A boolean that controls whether to generate a cover-letter when + format-patch is invoked, but in addition can be set to "auto", to + generate a cover-letter only when there's more than one patch. + filter.<driver>.clean:: The command which is used to convert the content of a worktree file to a blob upon checkin. See linkgit:gitattributes[5] for @@ -2016,6 +2021,7 @@ sendemail.<identity>.*:: sendemail.aliasesfile:: sendemail.aliasfiletype:: +sendemail.annotate:: sendemail.bcc:: sendemail.cc:: sendemail.cccmd:: |