From 30aa96cdf8dc8d93865cbb26f3692a87cb065f86 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Thu, 7 Jun 2018 07:53:36 -0400 Subject: 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 Signed-off-by: Junio C Hamano --- builtin/pull.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'builtin/pull.c') 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/ to refs/remotes//. @@ -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, -- cgit v1.3-5-g9baa