diff options
| author | Michael Schubert <mschub@elegosoft.com> | 2013-07-03 11:12:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-03 13:27:15 -0700 |
| commit | d6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5 (patch) | |
| tree | 2ccfcbad572e0f84dcdc29d8bc18c3d5fefc6c5f /Documentation/git-submodule.txt | |
| parent | f66d000b0d7d6d3c858f3aacd9a67d4809ac8011 (diff) | |
| download | git-d6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5.tar.gz git-d6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5.tar.xz | |
Change "remote tracking" to "remote-tracking"
Fix a typo ("remote remote-tracking") going back to the big cleanup
in 2010 (8b3f3f84 etc). Also, remove some more occurrences of
"tracking" and "remote tracking" in favor of "remote-tracking".
Signed-off-by: Michael Schubert <mschub@elegosoft.com>
Reviewed-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-submodule.txt')
| -rw-r--r-- | Documentation/git-submodule.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index e5767134b..bfff09062 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -262,7 +262,7 @@ OPTIONS --remote:: This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the - status of the submodule's remote tracking branch. The remote used + status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in |