summaryrefslogtreecommitdiffstats
path: root/git-submodule.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-07-06 22:35:57 -0700
committerJunio C Hamano <gitster@pobox.com>2020-07-06 22:35:57 -0700
commita89117826695bd15a06ab893f088622d58d49b0f (patch)
tree70a28e4da17998aca0ba3e65532c146377dc655b /git-submodule.html
parentcb66540f7a8e62233e4f403871e927e8de01bb3f (diff)
downloadgit-htmldocs-a89117826695bd15a06ab893f088622d58d49b0f.tar.gz
Autogenerated HTML docs for v2.27.0-343-g4a0fcf
Diffstat (limited to 'git-submodule.html')
-rw-r--r--git-submodule.html14
1 files changed, 7 insertions, 7 deletions
diff --git a/git-submodule.html b/git-submodule.html
index 8e3634074..ed57d959f 100644
--- a/git-submodule.html
+++ b/git-submodule.html
@@ -974,7 +974,7 @@ set-branch (-d|--default) [--] &lt;path&gt;
Sets the default remote tracking branch for the submodule. The
<code>--branch</code> option allows the remote branch to be specified. The
<code>--default</code> option removes the submodule.&lt;name&gt;.branch configuration
- key, which causes the tracking branch to default to <em>master</em>.
+ key, which causes the tracking branch to default to the remote <em>HEAD</em>.
</p>
</dd>
<dt class="hdlist1">
@@ -1123,7 +1123,7 @@ embedded into the superprojects git directory.</p></div>
<code>.gitmodules</code> for <code>update --remote</code>. A special value of <code>.</code> is used to
indicate that the name of the branch in the submodule should be the
same name as the current branch in the current repository. If the
- option is not specified, it defaults to <em>master</em>.
+ option is not specified, it defaults to the remote <em>HEAD</em>.
</p>
</dd>
<dt class="hdlist1">
@@ -1190,10 +1190,10 @@ embedded into the superprojects git directory.</p></div>
the superproject&#8217;s recorded SHA-1 to update the submodule, use the
status of the submodule&#8217;s remote-tracking branch. The remote used
is branch&#8217;s remote (<code>branch.&lt;name&gt;.remote</code>), defaulting to <code>origin</code>.
- The remote branch used defaults to <code>master</code>, but the branch name may
- be overridden by setting the <code>submodule.&lt;name&gt;.branch</code> option in
- either <code>.gitmodules</code> or <code>.git/config</code> (with <code>.git/config</code> taking
- precedence).
+ The remote branch used defaults to the remote <code>HEAD</code>, but the branch
+ name may be overridden by setting the <code>submodule.&lt;name&gt;.branch</code>
+ option in either <code>.gitmodules</code> or <code>.git/config</code> (with <code>.git/config</code>
+ taking precedence).
</p>
<div class="paragraph"><p>This works for any of the supported update procedures (<code>--checkout</code>,
<code>--rebase</code>, etc.). The only change is the source of the target SHA-1.
@@ -1407,7 +1407,7 @@ for details.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 08:03:13 PDT
+ 2020-07-06 22:33:22 PDT
</div>
</div>
</body>