Skip to content

Commit 30aa96c

Browse files
rpjdaygitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a42a58d commit 30aa96c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Documentation/git-submodule.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ have to use '../foo.git' instead of './foo.git' - as one might expect
4242
when following the rules for relative URLs - because the evaluation
4343
of relative URLs in Git is identical to that of relative directories).
4444
+
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
4747
the HEAD is detached, "origin" is assumed to be the default remote.
4848
If the superproject doesn't have a default remote configured
4949
the superproject is its own authoritative upstream and the current

builtin/branch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
698698
* If no sorting parameter is given then we default to sorting
699699
* by 'refname'. This would give us an alphabetically sorted
700700
* 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
702702
* branches 'refs/remotes/...'.
703703
*/
704704
if (!sorting)

builtin/pull.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ static const char *get_upstream_branch(const char *remote)
666666
}
667667

668668
/**
669-
* Derives the remote tracking branch from the remote and refspec.
669+
* Derives the remote-tracking branch from the remote and refspec.
670670
*
671671
* FIXME: The current implementation assumes the default mapping of
672672
* 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)
704704

705705
/**
706706
* 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,
708708
* -1 on failure.
709709
*/
710710
static int get_rebase_fork_point(struct object_id *fork_point, const char *repo,

0 commit comments

Comments
 (0)