summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-22 19:41:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-22 19:41:41 (GMT)
commit086d0d4ab6c9f2b6f789a16157c1a3685514efb3 (patch)
treeafc387cd3832fd1585a5c5ccbf5639dfb58ea731 /builtin/branch.c
parent6c1249c503f39ca45ca5b183527b22192cdaf7a7 (diff)
parentccd593cffaa020ff767860ec211462b8dbd727a6 (diff)
downloadgit-086d0d4ab6c9f2b6f789a16157c1a3685514efb3.zip
git-086d0d4ab6c9f2b6f789a16157c1a3685514efb3.tar.gz
git-086d0d4ab6c9f2b6f789a16157c1a3685514efb3.tar.bz2
Merge branch 'dl/branch-error-message'
Error messages from "git branch" called remote-tracking branches as "remote branches". * dl/branch-error-message: branch: do not call a "remote-tracking branch" a "remote branch"
Diffstat (limited to 'builtin/branch.c')
-rw-r--r--builtin/branch.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index 258fe2f..9cbab18 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -242,7 +242,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
sha1, &flags);
if (!target) {
error(remote_branch
- ? _("remote branch '%s' not found.")
+ ? _("remote-tracking branch '%s' not found.")
: _("branch '%s' not found."), bname.buf);
ret = 1;
continue;
@@ -257,7 +257,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
if (delete_ref(name, sha1, REF_NODEREF)) {
error(remote_branch
- ? _("Error deleting remote branch '%s'")
+ ? _("Error deleting remote-tracking branch '%s'")
: _("Error deleting branch '%s'"),
bname.buf);
ret = 1;
@@ -265,7 +265,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
}
if (!quiet) {
printf(remote_branch
- ? _("Deleted remote branch %s (was %s).\n")
+ ? _("Deleted remote-tracking branch %s (was %s).\n")
: _("Deleted branch %s (was %s).\n"),
bname.buf,
(flags & REF_ISBROKEN) ? "broken"