From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Oct 2018 01:15:31 +0000 (+0900)
Subject: Merge branches 'bp/reset-quiet' and 'js/mingw-http-ssl' into nd/config-split
X-Git-Tag: v2.20.0-rc0~59^2~78
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/89e4fcb0dd01b42e82b8f27f9a575111a26844df

Merge branches 'bp/reset-quiet' and 'js/mingw-http-ssl' into nd/config-split

* bp/reset-quiet:
reset: warn when refresh_index() takes more than 2 seconds
reset: add new reset.quiet config setting
reset: don't compute unstaged changes after reset when --quiet

* js/mingw-http-ssl:
http: when using Secure Channel, ignore sslCAInfo by default
http: add support for disabling SSL revocation checks in cURL
http: add support for selecting SSL backends at runtime
---

89e4fcb0dd01b42e82b8f27f9a575111a26844df
diff --cc Documentation/config.txt
index 552827935a,ce26a743ba,56a1104469..ff2d0190f6
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@@ -2753,15 -2757,18 -3248,71 +2778,18 @@@@ rerere.enabled:
   	`$GIT_DIR`, e.g. if "rerere" was previously used in the
   	repository.
   
  -sendemail.identity::
  -	A configuration identity. When given, causes values in the
  -	'sendemail.<identity>' subsection to take precedence over
  -	values in the 'sendemail' section. The default identity is
  -	the value of `sendemail.identity`.
  -
  -sendemail.smtpEncryption::
  -	See linkgit:git-send-email[1] for description.  Note that this
  -	setting is not subject to the 'identity' mechanism.
  -
  -sendemail.smtpssl (deprecated)::
  -	Deprecated alias for 'sendemail.smtpEncryption = ssl'.
  -
  -sendemail.smtpsslcertpath::
  -	Path to ca-certificates (either a directory or a single file).
  -	Set it to an empty string to disable certificate verification.
  -
  -sendemail.<identity>.*::
  -	Identity-specific versions of the 'sendemail.*' parameters
  -	found below, taking precedence over those when this
  -	identity is selected, through either the command-line or
  -	`sendemail.identity`.
  -
  -sendemail.aliasesFile::
  -sendemail.aliasFileType::
  -sendemail.annotate::
  -sendemail.bcc::
  -sendemail.cc::
  -sendemail.ccCmd::
  -sendemail.chainReplyTo::
  -sendemail.confirm::
  -sendemail.envelopeSender::
  -sendemail.from::
  -sendemail.multiEdit::
  -sendemail.signedoffbycc::
  -sendemail.smtpPass::
  -sendemail.suppresscc::
  -sendemail.suppressFrom::
  -sendemail.to::
  -sendemail.tocmd::
  -sendemail.smtpDomain::
  -sendemail.smtpServer::
  -sendemail.smtpServerPort::
  -sendemail.smtpServerOption::
  -sendemail.smtpUser::
  -sendemail.thread::
  -sendemail.transferEncoding::
  -sendemail.validate::
  -sendemail.xmailer::
  -	See linkgit:git-send-email[1] for description.
  -
  -sendemail.signedoffcc (deprecated)::
  -	Deprecated alias for `sendemail.signedoffbycc`.
  -
  -sendemail.smtpBatchSize::
  -	Number of messages to be sent per connection, after that a relogin
  -	will happen.  If the value is 0 or undefined, send all messages in
  -	one connection.
  -	See also the `--batch-size` option of linkgit:git-send-email[1].
  -
  -sendemail.smtpReloginDelay::
  -	Seconds wait before reconnecting to smtp server.
  -	See also the `--relogin-delay` option of linkgit:git-send-email[1].
  -
  -showbranch.default::
+ +reset.quiet::
+ +	When set to true, 'git reset' will default to the '--quiet' option.
+ +
  +include::sendemail-config.txt[]
  +
  +sequence.editor::
  +	Text editor used by `git rebase -i` for editing the rebase instruction file.
  +	The value is meant to be interpreted by the shell when it is used.
  +	It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable.
  +	When not configured the default commit message editor is used instead.
  +
  +showBranch.default::
   	The default set of branches for linkgit:git-show-branch[1].
   	See linkgit:git-show-branch[1].