diff options
| author | Robert P. J. Day <rpjday@crashcourse.ca> | 2018-06-07 07:53:36 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-13 09:57:09 -0700 |
| commit | 30aa96cdf8dc8d93865cbb26f3692a87cb065f86 (patch) | |
| tree | ce7f8095797c26a4e84b5613223938c0036fad82 /Documentation/git-submodule.txt | |
| parent | a42a58d7b62cc1d6301440e81a83feed9d7c118c (diff) | |
| download | git-30aa96cdf8dc8d93865cbb26f3692a87cb065f86.tar.gz | |
Use hyphenated "remote-tracking branch" (docs and comments)
Use the obvious consensus of hyphenated "remote-tracking branch", and
fix an obvious typo, all in documentation and comments.
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-submodule.txt')
| -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 71c5618e82..d654197903 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 |