From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Mar 2018 22:54:05 +0000 (-0800)
Subject: Merge branch 'bw/doc-submodule-recurse-config-with-clone'
X-Git-Tag: v2.17.0-rc0~40
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/96608043d95e5f8d9a22eba325931809e554792d?hp=-c

Merge branch 'bw/doc-submodule-recurse-config-with-clone'

Doc update.

* bw/doc-submodule-recurse-config-with-clone:
submodule: indicate that 'submodule.recurse' doesn't apply to clone
---

96608043d95e5f8d9a22eba325931809e554792d
diff --combined Documentation/config.txt
index bbd66f5b98,9a85e3108e..ce9102cea8
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1398,16 -1398,7 +1398,16 @@@ fetch.unpackLimit:
  
  fetch.prune::
  	If true, fetch will automatically behave as if the `--prune`
 -	option was given on the command line.  See also `remote.<name>.prune`.
 +	option was given on the command line.  See also `remote.<name>.prune`
 +	and the PRUNING section of linkgit:git-fetch[1].
 +
 +fetch.pruneTags::
 +	If true, fetch will automatically behave as if the
 +	`refs/tags/*:refs/tags/*` refspec was provided when pruning,
 +	if not set already. This allows for setting both this option
 +	and `fetch.prune` to maintain a 1=1 mapping to upstream
 +	refs. See also `remote.<name>.pruneTags` and the PRUNING
 +	section of linkgit:git-fetch[1].
  
  fetch.output::
  	Control how ref update status is printed. Valid values are
@@@ -2954,15 -2945,6 +2954,15 @@@ remote.<name>.prune:
  	remote (as if the `--prune` option was given on the command line).
  	Overrides `fetch.prune` settings, if any.
  
 +remote.<name>.pruneTags::
 +	When set to true, fetching from this remote by default will also
 +	remove any local tags that no longer exist on the remote if pruning
 +	is activated in general via `remote.<name>.prune`, `fetch.prune` or
 +	`--prune`. Overrides `fetch.pruneTags` settings, if any.
 ++
 +See also `remote.<name>.prune` and the PRUNING section of
 +linkgit:git-fetch[1].
 +
  remotes.<group>::
  	The list of remotes which are fetched by "git remote update
  	<group>".  See linkgit:git-remote[1].
@@@ -3228,7 -3210,8 +3228,8 @@@ submodule.active:
  
  submodule.recurse::
  	Specifies if commands recurse into submodules by default. This
- 	applies to all commands that have a `--recurse-submodules` option.
+ 	applies to all commands that have a `--recurse-submodules` option,
+ 	except `clone`.
  	Defaults to false.
  
  submodule.fetchJobs::
@@@ -3361,10 -3344,6 +3362,10 @@@ uploadpack.packObjectsHook:
  	was run. I.e., `upload-pack` will feed input intended for
  	`pack-objects` to the hook, and expects a completed packfile on
  	stdout.
 +
 +uploadpack.allowFilter::
 +	If this option is set, `upload-pack` will advertise partial
 +	clone and partial fetch object filtering.
  +
  Note that this configuration variable is ignored if it is seen in the
  repository-level config (this is a safety measure against fetching from