summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-10-07 11:32:56 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-07 11:32:56 +0900
commit7f17913161ef06fb983f02fae02fc580863cd605 (patch)
tree2cbacf33012efd924f04df32831b7edd2bf0169d /Documentation
parentMerge branch 'cs/pretty-formats-doc-typofix' (diff)
parentgit-submodule.txt: fix AsciiDoc formatting error (diff)
downloadtgif-7f17913161ef06fb983f02fae02fc580863cd605.tar.xz
Merge branch 'dl/submodule-set-branch'
Docfix. * dl/submodule-set-branch: git-submodule.txt: fix AsciiDoc formatting error
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-submodule.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 0ed5c24dc1..1f46380af2 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -173,7 +173,8 @@ submodule with the `--init` option.
If `--recursive` is specified, this command will recurse into the
registered submodules, and update any nested submodules within.
--
-set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>::
+set-branch (-b|--branch) <branch> [--] <path>::
+set-branch (-d|--default) [--] <path>::
Sets the default remote tracking branch for the submodule. The
`--branch` option allows the remote branch to be specified. The
`--default` option removes the submodule.<name>.branch configuration