diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-12 12:04:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-12 12:04:07 -0700 |
| commit | 778e4b890390e90e19b7f835f3b0ffe92e8d5345 (patch) | |
| tree | e93c198c3c051a4ce8320f83abd0d11310b10b30 /builtin | |
| parent | Merge branch 'jk/pull-to-integrate' (diff) | |
| parent | Change "remote tracking" to "remote-tracking" (diff) | |
| download | tgif-778e4b890390e90e19b7f835f3b0ffe92e8d5345.tar.xz | |
Merge branch 'ms/remote-tracking-branches-in-doc'
* ms/remote-tracking-branches-in-doc:
Change "remote tracking" to "remote-tracking"
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/clone.c | 2 | ||||
| -rw-r--r-- | builtin/merge.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 14b1323568..17f57cdf29 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -701,7 +701,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 2ebe732896..bad4536a87 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; } |