Re: [PATCH v2] git-submodule.txt: fix AsciiDoc formatting error
From: Junio C Hamano <hidden>
Date: 2019-09-16 19:25:52
Denton Liu [off-list ref] writes:
Break `--default` and `--branch` into their own separate invocations to make it obvious that these options are mutually exclusive.
That sounds even clearer than what the original wanted to do. Very good idea.
quoted hunk
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