@@ -1387,6 +1387,50 @@ rerere.enabled::
13871387 default enabled if you create `rr-cache` directory under
13881388 `$GIT_DIR`, but can be disabled by setting this option to false.
13891389
1390+ sendemail.identity::
1391+ A configuration identity. When given, causes values in the
1392+ 'sendemail.<identity>' subsection to take precedence over
1393+ values in the 'sendemail' section. The default identity is
1394+ the value of 'sendemail.identity'.
1395+
1396+ sendemail.smtpencryption::
1397+ See linkgit:git-send-email[1] for description. Note that this
1398+ setting is not subject to the 'identity' mechanism.
1399+
1400+ sendemail.smtpssl::
1401+ Deprecated alias for 'sendemail.smtpencryption = ssl'.
1402+
1403+ sendemail.<identity>.*::
1404+ Identity-specific versions of the 'sendemail.*' parameters
1405+ found below, taking precedence over those when the this
1406+ identity is selected, through command-line or
1407+ 'sendemail.identity'.
1408+
1409+ sendemail.aliasesfile::
1410+ sendemail.aliasfiletype::
1411+ sendemail.bcc::
1412+ sendemail.cc::
1413+ sendemail.cccmd::
1414+ sendemail.chainreplyto::
1415+ sendemail.confirm::
1416+ sendemail.envelopesender::
1417+ sendemail.from::
1418+ sendemail.multiedit::
1419+ sendemail.signedoffbycc::
1420+ sendemail.smtppass::
1421+ sendemail.suppresscc::
1422+ sendemail.suppressfrom::
1423+ sendemail.to::
1424+ sendemail.smtpserver::
1425+ sendemail.smtpserverport::
1426+ sendemail.smtpuser::
1427+ sendemail.thread::
1428+ sendemail.validate::
1429+ See linkgit:git-send-email[1] for description.
1430+
1431+ sendemail.signedoffcc::
1432+ Deprecated alias for 'sendemail.signedoffbycc'.
1433+
13901434showbranch.default::
13911435 The default set of branches for linkgit:git-show-branch[1].
13921436 See linkgit:git-show-branch[1].
0 commit comments