summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorMichael Schubert <mschub@elegosoft.com>2013-07-03 09:12:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-03 20:27:15 (GMT)
commitd6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5 (patch)
tree2ccfcbad572e0f84dcdc29d8bc18c3d5fefc6c5f /builtin
parentf66d000b0d7d6d3c858f3aacd9a67d4809ac8011 (diff)
downloadgit-d6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5.zip
git-d6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5.tar.gz
git-d6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5.tar.bz2
Change "remote tracking" to "remote-tracking"
Fix a typo ("remote remote-tracking") going back to the big cleanup in 2010 (8b3f3f84 etc). Also, remove some more occurrences of "tracking" and "remote tracking" in favor of "remote-tracking". Signed-off-by: Michael Schubert <mschub@elegosoft.com> Reviewed-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/clone.c2
-rw-r--r--builtin/merge.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/clone.c b/builtin/clone.c
index dad4265..9d98cb5 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -697,7 +697,7 @@ static void write_refspec_config(const char* src_ref_prefix,
/*
* otherwise, the next "git fetch" will
* simply fetch from HEAD without updating
- * any remote tracking branch, which is what
+ * any remote-tracking branch, which is what
* we want.
*/
} else {
diff --git a/builtin/merge.c b/builtin/merge.c
index 3e2daa3..622f5db 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -948,7 +948,7 @@ static int evaluate_result(void)
}
/*
- * Pretend as if the user told us to merge with the tracking
+ * Pretend as if the user told us to merge with the remote-tracking
* branch we have for the upstream of the current branch
*/
static int setup_with_upstream(const char ***argv)
@@ -967,7 +967,7 @@ static int setup_with_upstream(const char ***argv)
args = xcalloc(branch->merge_nr + 1, sizeof(char *));
for (i = 0; i < branch->merge_nr; i++) {
if (!branch->merge[i]->dst)
- die(_("No remote tracking branch for %s from %s"),
+ die(_("No remote-tracking branch for %s from %s"),
branch->merge[i]->src, branch->remote_name);
args[i] = branch->merge[i]->dst;
}