From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Dec 2015 18:59:05 +0000 (-0800)
Subject: Merge branch 'mc/push-recurse-submodules-config'
X-Git-Tag: v2.7.0-rc2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5d35d72fc3030360d9b717a4c755e9ec877d00e5?ds=inline;hp=-c

Merge branch 'mc/push-recurse-submodules-config'

Add new config to avoid typing "--recurse-submodules" on each push.

* mc/push-recurse-submodules-config:
push: follow the "last one wins" convention for --recurse-submodules
push: test that --recurse-submodules on command line overrides config
push: add recurseSubmodules config option
---

5d35d72fc3030360d9b717a4c755e9ec877d00e5
diff --combined Documentation/config.txt
index 2d06b11f25,8c02e43483..f61788668e
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1122,9 -1122,6 +1122,9 @@@ credential.<url>.*:
  	example.com. See linkgit:gitcredentials[7] for details on how URLs are
  	matched.
  
 +credentialCache.ignoreSIGHUP::
 +	Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting.
 +
  include::diff-config.txt[]
  
  difftool.<tool>.path::
@@@ -2229,6 -2226,20 +2229,20 @@@ push.gpgSign:
  	override a value from a lower-priority config file. An explicit
  	command-line flag always overrides this config option.
  
+ push.recurseSubmodules::
+ 	Make sure all submodule commits used by the revisions to be pushed
+ 	are available on a remote-tracking branch. If the value is 'check'
+ 	then Git will verify that all submodule commits that changed in the
+ 	revisions to be pushed are available on at least one remote of the
+ 	submodule. If any commits are missing, the push will be aborted and
+ 	exit with non-zero status. If the value is 'on-demand' then all
+ 	submodules that changed in the revisions to be pushed will be
+ 	pushed. If on-demand was not able to push all necessary revisions
+ 	it will also be aborted and exit with non-zero status. If the value
+ 	is 'no' then default behavior of ignoring submodules when pushing
+ 	is retained. You may override this configuration at time of push by
+ 	specifying '--recurse-submodules=check|on-demand|no'.
+ 
  rebase.stat::
  	Whether to show a diffstat of what changed upstream since the last
  	rebase. False by default.