For each configuration variable, the reader is either prompted to seek out the description of the corresponding command line option, or a description is given if there is no corresponding command line option. The CONFIGURATION section has also been recast into the Composing, Sending, Automating, and Administering sections, and configuration variables are listed in alphabetical order within each section. Signed-off-by: Michael Witten <mfwitten@xxxxxxxxx> --- Documentation/git-send-email.txt | 83 ++++++++++++++++++++++++++++++++++---- 1 files changed, 75 insertions(+), 8 deletions(-) diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 92985ee..6f770d0 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -282,6 +282,28 @@ default to '--validate'. CONFIGURATION ------------- +Composing +~~~~~~~~~ + +sendemail.bcc:: + See '--bcc' + +sendemail.cc:: + See '--cc' + +sendemail.multiedit:: + If true (default), a single editor instance will be spawned to edit + files you have to edit (patches when '--annotate' is used, and the + summary when '--compose' is used). If false, files will be edited one + after the other, spawning a new editor each time. + +sendemail.to:: + See '--from' + + +Sending +~~~~~~~ + sendemail.aliasesfile:: To avoid typing long email addresses, point this to one or more email aliases files. You must also supply 'sendemail.aliasfiletype'. @@ -290,16 +312,61 @@ sendemail.aliasfiletype:: Format of the file(s) specified in sendemail.aliasesfile. Must be one of 'mutt', 'mailrc', 'pine', or 'gnus'. -sendemail.multiedit:: - If true (default), a single editor instance will be spawned to edit - files you have to edit (patches when '--annotate' is used, and the - summary when '--compose' is used). If false, files will be edited one - after the other, spawning a new editor each time. +sendemail.envelopesender:: + See '--envelope-sender' + +sendemail.smtpencryption:: + See '--smtp-encryption' + +sendemail.smtppass:: + See '--smtp-pass' + +sendemail.smtpserver:: + See '--smtp-server' + +sendemail.smtpserverport:: + See '--smtp-server-port' + +sendemail.smtpuser:: + See '--smtp-ssl' + + +Automating +~~~~~~~~~~ + +sendemail.cccmd:: + See '--cc-cmd' + +sendemail.chainreplyto:: + See '--[no-]chain-reply-to' + +sendemail.identity:: + See '--identity' + +sendemail.signedoffbycc:: + See '--[no-]signed-off-by-cc' + +sendemail.sleep:: + See '--sleep' + +sendemail.suppresscc:: + See '--suppress-cc' + +sendemail.suppressfrom:: + See '--[no-]suppress-from' + +sendemail.thread:: + See '--[no-]thread' + + +Administering +~~~~~~~~~~~~~ sendemail.confirm:: - Sets the default for whether to confirm before sending. Must be - one of 'always', 'never', 'cc', 'compose', or 'auto'. See '--confirm' - in the previous section for the meaning of these values. + See '--confirm' + +sendemail.validate:: + See '--dry-run' Author -- 1.6.2.2.479.g2aec -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html