diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-04-25 16:41:18 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-25 16:41:18 +0900 |
| commit | 01f8d78887d45dc10f29d3926d5cc52f78838846 (patch) | |
| tree | bd36c10864e4a75d757732e8324e8e21b4d5b917 /contrib | |
| parent | Merge branch 'jk/revision-rewritten-parents-in-prio-queue' (diff) | |
| parent | submodule: teach set-branch subcommand (diff) | |
| download | tgif-01f8d78887d45dc10f29d3926d5cc52f78838846.tar.xz | |
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'
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 42a3c8e524..3eefbabdb1 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2611,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 absorbgitdirs" local subcommand="$(__git_find_on_cmdline "$subcommands")" if [ -z "$subcommand" ]; then case "$cur" in @@ -2642,6 +2642,9 @@ _git_submodule () --force --rebase --merge --reference --depth --recursive --jobs " ;; + set-branch,--*) + __gitcomp "--default --branch" + ;; summary,--*) __gitcomp "--cached --files --summary-limit" ;; |