mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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>
This commit is contained in:
parent
a42a58d7b6
commit
30aa96cdf8
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue