diff options
| author | Michael Schubert <mschub@elegosoft.com> | 2013-07-03 11:12:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-03 13:27:15 -0700 |
| commit | d6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5 (patch) | |
| tree | 2ccfcbad572e0f84dcdc29d8bc18c3d5fefc6c5f /builtin/merge.c | |
| parent | f66d000b0d7d6d3c858f3aacd9a67d4809ac8011 (diff) | |
| download | git-d6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5.tar.gz git-d6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5.tar.xz | |
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/merge.c')
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 3e2daa37c..622f5db89 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; } |