development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use hyphenated "remote-tracking branch" (docs and comments)

Browse source 
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:
Robert P. J. Day 2018-06-07 07:53:36 -04:00 committed by Junio C Hamano
parent a42a58d7b6
commit 30aa96cdf8
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/git-submodule.txt
View file

@ -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 when following the rules for relative URLs - because the evaluation
of relative URLs in Git is identical to that of relative directories). of relative URLs in Git is identical to that of relative directories).
+ +
The default remote is the remote of the remote tracking branch The default remote is the remote of the remote-tracking branch
of the current branch. If no such remote tracking branch exists or of the current branch. If no such remote-tracking branch exists or
the HEAD is detached, "origin" is assumed to be the default remote. the HEAD is detached, "origin" is assumed to be the default remote.
If the superproject doesn't have a default remote configured If the superproject doesn't have a default remote configured
the superproject is its own authoritative upstream and the current the superproject is its own authoritative upstream and the current

2
builtin/branch.c
View file

@ -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 * If no sorting parameter is given then we default to sorting
* by 'refname'. This would give us an alphabetically sorted * by 'refname'. This would give us an alphabetically sorted
* array with the 'HEAD' ref at the beginning followed by * 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/...'. * branches 'refs/remotes/...'.
*/ */
if (!sorting) if (!sorting)

4
builtin/pull.c
View file

@ -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 * FIXME: The current implementation assumes the default mapping of
* refs/heads/<branch_name> to refs/remotes/<remote_name>/<branch_name>. * 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 * 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. * -1 on failure.
*/ */
static int get_rebase_fork_point(struct object_id *fork_point, const char *repo, static int get_rebase_fork_point(struct object_id *fork_point, const char *repo,