mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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
Download Patch File Download Diff File Expand all files Collapse all files

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
* 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,