Skip to content

Commit 701137e

Browse files
pcloudsgitster
authored andcommitted
config.txt: move sendemail part out to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent aaa3b45 commit 701137e

File tree

2 files changed

+64
-63
lines changed

2 files changed

+64
-63
lines changed

Documentation/config.txt

Lines changed: 1 addition & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -2686,69 +2686,7 @@ rerere.enabled::
26862686
`$GIT_DIR`, e.g. if "rerere" was previously used in the
26872687
repository.
26882688

2689-
sendemail.identity::
2690-
A configuration identity. When given, causes values in the
2691-
'sendemail.<identity>' subsection to take precedence over
2692-
values in the 'sendemail' section. The default identity is
2693-
the value of `sendemail.identity`.
2694-
2695-
sendemail.smtpEncryption::
2696-
See linkgit:git-send-email[1] for description. Note that this
2697-
setting is not subject to the 'identity' mechanism.
2698-
2699-
sendemail.smtpssl (deprecated)::
2700-
Deprecated alias for 'sendemail.smtpEncryption = ssl'.
2701-
2702-
sendemail.smtpsslcertpath::
2703-
Path to ca-certificates (either a directory or a single file).
2704-
Set it to an empty string to disable certificate verification.
2705-
2706-
sendemail.<identity>.*::
2707-
Identity-specific versions of the 'sendemail.*' parameters
2708-
found below, taking precedence over those when this
2709-
identity is selected, through either the command-line or
2710-
`sendemail.identity`.
2711-
2712-
sendemail.aliasesFile::
2713-
sendemail.aliasFileType::
2714-
sendemail.annotate::
2715-
sendemail.bcc::
2716-
sendemail.cc::
2717-
sendemail.ccCmd::
2718-
sendemail.chainReplyTo::
2719-
sendemail.confirm::
2720-
sendemail.envelopeSender::
2721-
sendemail.from::
2722-
sendemail.multiEdit::
2723-
sendemail.signedoffbycc::
2724-
sendemail.smtpPass::
2725-
sendemail.suppresscc::
2726-
sendemail.suppressFrom::
2727-
sendemail.to::
2728-
sendemail.tocmd::
2729-
sendemail.smtpDomain::
2730-
sendemail.smtpServer::
2731-
sendemail.smtpServerPort::
2732-
sendemail.smtpServerOption::
2733-
sendemail.smtpUser::
2734-
sendemail.thread::
2735-
sendemail.transferEncoding::
2736-
sendemail.validate::
2737-
sendemail.xmailer::
2738-
See linkgit:git-send-email[1] for description.
2739-
2740-
sendemail.signedoffcc (deprecated)::
2741-
Deprecated alias for `sendemail.signedoffbycc`.
2742-
2743-
sendemail.smtpBatchSize::
2744-
Number of messages to be sent per connection, after that a relogin
2745-
will happen. If the value is 0 or undefined, send all messages in
2746-
one connection.
2747-
See also the `--batch-size` option of linkgit:git-send-email[1].
2748-
2749-
sendemail.smtpReloginDelay::
2750-
Seconds wait before reconnecting to smtp server.
2751-
See also the `--relogin-delay` option of linkgit:git-send-email[1].
2689+
include::sendemail-config.txt[]
27522690

27532691
showBranch.default::
27542692
The default set of branches for linkgit:git-show-branch[1].

Documentation/sendemail-config.txt

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
sendemail.identity::
2+
A configuration identity. When given, causes values in the
3+
'sendemail.<identity>' subsection to take precedence over
4+
values in the 'sendemail' section. The default identity is
5+
the value of `sendemail.identity`.
6+
7+
sendemail.smtpEncryption::
8+
See linkgit:git-send-email[1] for description. Note that this
9+
setting is not subject to the 'identity' mechanism.
10+
11+
sendemail.smtpssl (deprecated)::
12+
Deprecated alias for 'sendemail.smtpEncryption = ssl'.
13+
14+
sendemail.smtpsslcertpath::
15+
Path to ca-certificates (either a directory or a single file).
16+
Set it to an empty string to disable certificate verification.
17+
18+
sendemail.<identity>.*::
19+
Identity-specific versions of the 'sendemail.*' parameters
20+
found below, taking precedence over those when this
21+
identity is selected, through either the command-line or
22+
`sendemail.identity`.
23+
24+
sendemail.aliasesFile::
25+
sendemail.aliasFileType::
26+
sendemail.annotate::
27+
sendemail.bcc::
28+
sendemail.cc::
29+
sendemail.ccCmd::
30+
sendemail.chainReplyTo::
31+
sendemail.confirm::
32+
sendemail.envelopeSender::
33+
sendemail.from::
34+
sendemail.multiEdit::
35+
sendemail.signedoffbycc::
36+
sendemail.smtpPass::
37+
sendemail.suppresscc::
38+
sendemail.suppressFrom::
39+
sendemail.to::
40+
sendemail.tocmd::
41+
sendemail.smtpDomain::
42+
sendemail.smtpServer::
43+
sendemail.smtpServerPort::
44+
sendemail.smtpServerOption::
45+
sendemail.smtpUser::
46+
sendemail.thread::
47+
sendemail.transferEncoding::
48+
sendemail.validate::
49+
sendemail.xmailer::
50+
See linkgit:git-send-email[1] for description.
51+
52+
sendemail.signedoffcc (deprecated)::
53+
Deprecated alias for `sendemail.signedoffbycc`.
54+
55+
sendemail.smtpBatchSize::
56+
Number of messages to be sent per connection, after that a relogin
57+
will happen. If the value is 0 or undefined, send all messages in
58+
one connection.
59+
See also the `--batch-size` option of linkgit:git-send-email[1].
60+
61+
sendemail.smtpReloginDelay::
62+
Seconds wait before reconnecting to smtp server.
63+
See also the `--relogin-delay` option of linkgit:git-send-email[1].

0 commit comments

Comments
 (0)