{"thread":{"id":"48667","subject":"[PATCH] Use hyphenated \"remote-tracking branch\" (docs and comments)","startedAt":"2018-06-07T11:55:58Z","lastAt":"2018-06-13T16:57:46Z","messageCount":2,"participants":["Robert P. J. Day","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"349607","messageId":"alpine.LFD.2.21.1806070751020.10794@localhost.localdomain","threadId":"48667","inReplyTo":null,"subject":"[PATCH] Use hyphenated \"remote-tracking branch\" (docs and comments)","fromName":"Robert P. J. Day","fromEmail":"rpjday@crashcourse.ca","sentAt":"2018-06-07T11:53:36Z","receivedAt":"2018-06-07T11:55:58Z","isPatch":true,"sender":{"key":"rpjday@crashcourse.ca","avatar":"https://avatars.githubusercontent.com/u/226084077?v=4"},"body":"\nUse the obvious consensus of hyphenated \"remote-tracking branch\", and\nfix an obvious typo, all in documentation and comments.\n\nSigned-off-by: Robert P. J. Day <rpjday@crashcourse.ca>\n\n---\n\ndiff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt\nindex 4a5cc38a6f..ef9d9d28a9 100644\n--- a/Documentation/git-submodule.txt\n+++ b/Documentation/git-submodule.txt\n@@ -42,8 +42,8 @@ have to use '../foo.git' instead of './foo.git' - as one might expect\n when following the rules for relative URLs - because the evaluation\n of relative URLs in Git is identical to that of relative directories).\n +\n-The default remote is the remote of the remote tracking branch\n-of the current branch. If no such remote tracking branch exists or\n+The default remote is the remote of the remote-tracking branch\n+of the current branch. If no such remote-tracking branch exists or\n the HEAD is detached, \"origin\" is assumed to be the default remote.\n If the superproject doesn't have a default remote configured\n the superproject is its own authoritative upstream and the current\ndiff --git a/builtin/branch.c b/builtin/branch.c\nindex d53f6e2ad4..5217ba3bde 100644\n--- a/builtin/branch.c\n+++ b/builtin/branch.c\n@@ -701,7 +701,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)\n \t\t * If no sorting parameter is given then we default to sorting\n \t\t * by 'refname'. This would give us an alphabetically sorted\n \t\t * array with the 'HEAD' ref at the beginning followed by\n-\t\t * local branches 'refs/heads/...' and finally remote-tacking\n+\t\t * local branches 'refs/heads/...' and finally remote-tracking\n \t\t * branches 'refs/remotes/...'.\n \t\t */\n \t\tif (!sorting)\ndiff --git a/builtin/pull.c b/builtin/pull.c\nindex 1f2ecf3a88..49cc3beb4c 100644\n--- a/builtin/pull.c\n+++ b/builtin/pull.c\n@@ -673,7 +673,7 @@ static const char *get_upstream_branch(const char *remote)\n }\n\n /**\n- * Derives the remote tracking branch from the remote and refspec.\n+ * Derives the remote-tracking branch from the remote and refspec.\n  *\n  * FIXME: The current implementation assumes the default mapping of\n  * refs/heads/<branch_name> to refs/remotes/<remote_name>/<branch_name>.\n@@ -711,7 +711,7 @@ static const char *get_tracking_branch(const char *remote, const char *refspec)\n\n /**\n  * Given the repo and refspecs, sets fork_point to the point at which the\n- * current branch forked from its remote tracking branch. Returns 0 on success,\n+ * current branch forked from its remote-tracking branch. Returns 0 on success,\n  * -1 on failure.\n  */\n static int get_rebase_fork_point(struct object_id *fork_point, const char *repo,\n\n-- \n\n========================================================================\nRobert P. J. Day                                 Ottawa, Ontario, CANADA\n                  http://crashcourse.ca/dokuwiki\n\nTwitter:                                       http://twitter.com/rpjday\nLinkedIn:                               http://ca.linkedin.com/in/rpjday\n========================================================================\n"},{"id":"350066","messageId":"xmqqlgbi7hff.fsf@gitster-ct.c.googlers.com","threadId":"48667","inReplyTo":"alpine.LFD.2.21.1806070751020.10794@localhost.localdomain","subject":"Re: [PATCH] Use hyphenated \"remote-tracking branch\" (docs and comments)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-06-13T16:57:40Z","receivedAt":"2018-06-13T16:57:46Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Robert P. J. Day\" <rpjday@crashcourse.ca> writes:\n\n> Use the obvious consensus of hyphenated \"remote-tracking branch\", and\n> fix an obvious typo, all in documentation and comments.\n>\n> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>\n\nThanks.\n"}]}