diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-09-16 18:19:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-16 19:27:00 (GMT) |
| commit | 40e747e89d247b3a12e6cddf848d145bf403a72c (patch) | |
| tree | 8d9a4936f33aaa214c6eaa590c34a39341837ecc /Documentation/git-submodule.txt | |
| parent | b57e8119e6e08f731308923ef2b033eb45152bc6 (diff) | |
| download | git-40e747e89d247b3a12e6cddf848d145bf403a72c.zip git-40e747e89d247b3a12e6cddf848d145bf403a72c.tar.gz git-40e747e89d247b3a12e6cddf848d145bf403a72c.tar.bz2 | |
git-submodule.txt: fix AsciiDoc formatting error
In b57e8119e6 (submodule: teach set-branch subcommand, 2019-02-08), the
`set-branch` subcommand was added for submodules. When the documentation
was written, the syntax for a "index term" in AsciiDoc was
accidentally used. This caused the documentation to be rendered as
set-branch -d|--default)|(-b|--branch <branch> [--] <path>
instead of
set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>
In addition to this, the original documentation was possibly confusing
as it made it seem as if the `-b` option didn't accept a `<branch>`
argument.
Break `--default` and `--branch` into their own separate invocations to
make it obvious that these options are mutually exclusive. Also, this
removes the surrounding parentheses so that the "index term" syntax is
not triggered.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-submodule.txt')
| -rw-r--r-- | Documentation/git-submodule.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 4daf144..0474e7a 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -169,7 +169,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 |