From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Feb 2017 20:52:23 +0000 (-0800)
Subject: Merge branch 'bw/push-submodule-only'
X-Git-Tag: v2.12.0-rc1~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8e7c1f3240d16d93f4f48c5c1ffa1d5a1f69b298?ds=inline;hp=-c

Merge branch 'bw/push-submodule-only'

Add missing documentation update to a recent topic.

* bw/push-submodule-only:
completion: add completion for --recurse-submodules=only
doc: add doc for git-push --recurse-submodules=only
---

8e7c1f3240d16d93f4f48c5c1ffa1d5a1f69b298
diff --combined Documentation/git-push.txt
index 8eefabd0d1,df1d36e50e..1624a35888
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@@ -272,7 -272,7 +272,7 @@@ origin +master` to force a push to the 
  	standard error stream is not directed to a terminal.
  
  --no-recurse-submodules::
- --recurse-submodules=check|on-demand|no::
+ --recurse-submodules=check|on-demand|only|no::
  	May be used to make sure all submodule commits used by the
  	revisions to be pushed are available on a remote-tracking branch.
  	If 'check' is used Git will verify that all submodule commits that
@@@ -280,11 -280,12 +280,12 @@@
  	remote of the submodule. If any commits are missing the push will
  	be aborted and exit with non-zero status. If 'on-demand' is used
  	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. A value of
- 	'no' or using `--no-recurse-submodules` can be used to override the
- 	push.recurseSubmodules configuration variable when no submodule
- 	recursion is required.
+ 	pushed. If on-demand was not able to push all necessary revisions it will
+ 	also be aborted and exit with non-zero status. If 'only' is used all
+ 	submodules will be recursively pushed while the superproject is left
+ 	unpushed. A value of 'no' or using `--no-recurse-submodules` can be used
+ 	to override the push.recurseSubmodules configuration variable when no
+ 	submodule recursion is required.
  
  --[no-]verify::
  	Toggle the pre-push hook (see linkgit:githooks[5]).  The
@@@ -559,8 -560,6 +560,8 @@@ Commits A and B would no longer belong 
  and so would be unreachable.  As such, these commits would be removed by
  a `git gc` command on the origin repository.
  
 +include::transfer-data-leaks.txt[]
 +
  GIT
  ---
  Part of the linkgit:git[1] suite
diff --combined contrib/completion/git-completion.bash
index 97d73ad88f,c5207cf55e..f0ce11296c
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1206,7 -1206,7 +1206,7 @@@ _git_describe (
  
  __git_diff_algorithms="myers minimal patience histogram"
  
 -__git_diff_submodule_formats="log short"
 +__git_diff_submodule_formats="diff log short"
  
  __git_diff_common_options="--stat --numstat --shortstat --summary
  			--patch-with-stat --name-only --name-status --color
@@@ -1552,7 -1552,7 +1552,7 @@@ _git_merge (
  	case "$cur" in
  	--*)
  		__gitcomp "$__git_merge_options
 -			--rerere-autoupdate --no-rerere-autoupdate --abort"
 +			--rerere-autoupdate --no-rerere-autoupdate --abort --continue"
  		return
  	esac
  	__gitcomp_nl "$(__git_refs)"
@@@ -1674,7 -1674,7 +1674,7 @@@ _git_pull (
  	__git_complete_remote_or_refspec
  }
  
- __git_push_recurse_submodules="check on-demand"
+ __git_push_recurse_submodules="check on-demand only"
  
  __git_complete_force_with_lease ()
  {