summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Lin <danny0838@gmail.com>2015-05-06 19:01:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-06 20:01:32 (GMT)
commitccd593cffaa020ff767860ec211462b8dbd727a6 (patch)
tree0ca2c1174df33b1b5cd398aaf4b86cfc909aad29
parentfdf96a20acf96a6ac538df8113b2aafd6ed71d50 (diff)
downloadgit-ccd593cffaa020ff767860ec211462b8dbd727a6.zip
git-ccd593cffaa020ff767860ec211462b8dbd727a6.tar.gz
git-ccd593cffaa020ff767860ec211462b8dbd727a6.tar.bz2
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>
-rw-r--r--builtin/branch.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index 3b79c50..68ac4c4 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"