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>
Robert P. J. Day committed
Jun 7, 2018 at 07:53 UTC
30aa96cdf8dc8d93865cbb26f3692a87cb065f86
3 files changed
+5
-5
Documentation/git-submodule.txt
+2
-2
@@ -42,8 +42,8 @@ have to use '../foo.git' instead of './foo.git' - as one might expect
42
when following the rules for relative URLs - because the evaluation
43
of relative URLs in Git is identical to that of relative directories).
44
+
45
-The default remote is the remote of the remote tracking branch
46
-of the current branch. If no such remote tracking branch exists or
45
+The default remote is the remote of the remote-tracking branch
46
+of the current branch. If no such remote-tracking branch exists or
47
the HEAD is detached, "origin" is assumed to be the default remote.
48
If the superproject doesn't have a default remote configured
49
the superproject is its own authoritative upstream and the current
builtin/branch.c
+1
-1
@@ -698,7 +698,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
698
* If no sorting parameter is given then we default to sorting
699
* by 'refname'. This would give us an alphabetically sorted
700
* array with the 'HEAD' ref at the beginning followed by
701
- * local branches 'refs/heads/...' and finally remote-tacking
701
+ * local branches 'refs/heads/...' and finally remote-tracking
702
* branches 'refs/remotes/...'.
703
*/
704
if (!sorting)
builtin/pull.c
+2
-2
@@ -666,7 +666,7 @@ static const char *get_upstream_branch(const char *remote)
666
}
667
668
/**
669
- * Derives the remote tracking branch from the remote and refspec.
669
+ * Derives the remote-tracking branch from the remote and refspec.
670
*
671
* FIXME: The current implementation assumes the default mapping of
672
* 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)
704
705
/**
706
* Given the repo and refspecs, sets fork_point to the point at which the
707
- * current branch forked from its remote tracking branch. Returns 0 on success,
707
+ * current branch forked from its remote-tracking branch. Returns 0 on success,
708
* -1 on failure.
709
*/
710
static int get_rebase_fork_point(struct object_id *fork_point, const char *repo,