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 | |
| 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>
| -rw-r--r-- | Documentation/git-submodule.txt | 4 | ||||
| -rw-r--r-- | builtin/branch.c | 2 | ||||
| -rw-r--r-- | builtin/pull.c | 4 |
3 files changed, 5 insertions, 5 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 diff --git a/builtin/branch.c b/builtin/branch.c index 8dcc2ed058..a64e435032 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -698,7 +698,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) * If no sorting parameter is given then we default to sorting * by 'refname'. This would give us an alphabetically sorted * array with the 'HEAD' ref at the beginning followed by - * local branches 'refs/heads/...' and finally remote-tacking + * local branches 'refs/heads/...' and finally remote-tracking * branches 'refs/remotes/...'. */ if (!sorting) diff --git a/builtin/pull.c b/builtin/pull.c index 511dbbe0f6..f02009c389 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -666,7 +666,7 @@ static const char *get_upstream_branch(const char *remote) } /** - * Derives the remote tracking branch from the remote and refspec. + * Derives the remote-tracking branch from the remote and refspec. * * FIXME: The current implementation assumes the default mapping of * refs/heads/<branch_name> to refs/remotes/<remote_name>/<branch_name>. @@ -704,7 +704,7 @@ static const char *get_tracking_branch(const char *remote, const char *refspec) /** * Given the repo and refspecs, sets fork_point to the point at which the - * current branch forked from its remote tracking branch. Returns 0 on success, + * current branch forked from its remote-tracking branch. Returns 0 on success, * -1 on failure. */ static int get_rebase_fork_point(struct object_id *fork_point, const char *repo, |