diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-06-18 10:18:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-18 10:18:43 -0700 |
| commit | 929c0975482e78c4bd680b010a8ceac6c31160a0 (patch) | |
| tree | d78188ab5394b7afe2ce0be0d26f678fc5427b4d /Documentation | |
| parent | Merge branch 'jl/zlib-restore-nul-termination' (diff) | |
| parent | Use hyphenated "remote-tracking branch" (docs and comments) (diff) | |
| download | tgif-929c0975482e78c4bd680b010a8ceac6c31160a0.tar.xz | |
Merge branch 'rd/doc-remote-tracking-with-hyphen'
Doc update.
* rd/doc-remote-tracking-with-hyphen:
Use hyphenated "remote-tracking branch" (docs and comments)
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-submodule.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 4a5cc38a6f..ef9d9d28a9 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -42,8 +42,8 @@ have to use '../foo.git' instead of './foo.git' - as one might expect when following the rules for relative URLs - because the evaluation of relative URLs in Git is identical to that of relative directories). + -The default remote is the remote of the remote tracking branch -of the current branch. If no such remote tracking branch exists or +The default remote is the remote of the remote-tracking branch +of the current branch. If no such remote-tracking branch exists or the HEAD is detached, "origin" is assumed to be the default remote. If the superproject doesn't have a default remote configured the superproject is its own authoritative upstream and the current |