diff options
authorJunio C Hamano <>2018-06-18 17:18:43 (GMT)
committerJunio C Hamano <>2018-06-18 17:18:43 (GMT)
commit929c0975482e78c4bd680b010a8ceac6c31160a0 (patch)
parentfaff81287b5d69ef14408de22d3919cc7ff0ac06 (diff)
parent30aa96cdf8dc8d93865cbb26f3692a87cb065f86 (diff)
Merge branch 'rd/doc-remote-tracking-with-hyphen'
Doc update. * rd/doc-remote-tracking-with-hyphen: Use hyphenated "remote-tracking branch" (docs and comments)
3 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 4a5cc38..ef9d9d2 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -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
diff --git a/builtin/branch.c b/builtin/branch.c
index d53f6e2..5217ba3 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -701,7 +701,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)
diff --git a/builtin/pull.c b/builtin/pull.c
index 1f2ecf3..49cc3be 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -673,7 +673,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>.
@@ -711,7 +711,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,