branch: do not call a "remote-tracking branch" a "remote branch"
"git branch -r -d" mentions "delete remote branch", which should be "remote-tracking branch". Signed-off-by: Danny Lin <danny0838@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Danny Lin committed
May 7, 2015 at 03:01 UTC
ccd593cffaa020ff767860ec211462b8dbd727a6
1 file changed
+3
-3
builtin/branch.c
+3
-3
@@ -242,7 +242,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
242
sha1, &flags);
243
if (!target) {
244
error(remote_branch
245
- ? _("remote branch '%s' not found.")
245
+ ? _("remote-tracking branch '%s' not found.")
246
: _("branch '%s' not found."), bname.buf);
247
ret = 1;
248
continue;
@@ -257,7 +257,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
257
258
if (delete_ref(name, sha1, REF_NODEREF)) {
259
error(remote_branch
260
- ? _("Error deleting remote branch '%s'")
260
+ ? _("Error deleting remote-tracking branch '%s'")
261
: _("Error deleting branch '%s'"),
262
bname.buf);
263
ret = 1;
@@ -265,7 +265,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
265
}
266
if (!quiet) {
267
printf(remote_branch
268
- ? _("Deleted remote branch %s (was %s).\n")
268
+ ? _("Deleted remote-tracking branch %s (was %s).\n")
269
: _("Deleted branch %s (was %s).\n"),
270
bname.buf,
271
(flags & REF_ISBROKEN) ? "broken"