From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Apr 2019 07:41:18 +0000 (+0900)
Subject: Merge branch 'dl/submodule-set-branch'
X-Git-Tag: v2.22.0-rc0~55
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/01f8d78887d45dc10f29d3926d5cc52f78838846

Merge branch 'dl/submodule-set-branch'

"git submodule" learns "set-branch" subcommand that allows the
submodule.*.branch settings to be modified.

* dl/submodule-set-branch:
submodule: teach set-branch subcommand
submodule--helper: teach config subcommand --unset
git-submodule.txt: "--branch <branch>" option defaults to 'master'
---

01f8d78887d45dc10f29d3926d5cc52f78838846
diff --cc contrib/completion/git-completion.bash
index 42a3c8e524,8b3b5a9d34..3eefbabdb1
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -2611,7 -2573,7 +2611,7 @@@ _git_submodule (
  {
  	__git_has_doubledash && return
  
- 	local subcommands="add status init deinit update summary foreach sync absorbgitdirs"
 -	local subcommands="add status init deinit update set-branch summary foreach sync"
++	local subcommands="add status init deinit update set-branch summary foreach sync absorbgitdirs"
  	local subcommand="$(__git_find_on_cmdline "$subcommands")"
  	if [ -z "$subcommand" ]; then
  		case "$cur" in