summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-29 19:38:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-29 19:38:16 (GMT)
commit0c47e8ddf5e6584fe8baf8d25b2bcc4ca4c9cb5d (patch)
treeb9b2a705ea397e2fb0408b66879a5788fcae0c7f /builtin
parent747201d0c847980b3dc63eb0afc583dfac9c9d20 (diff)
parent1fde99cfc766353237ff1ca4829ba8d71ccebc87 (diff)
downloadgit-0c47e8ddf5e6584fe8baf8d25b2bcc4ca4c9cb5d.zip
git-0c47e8ddf5e6584fe8baf8d25b2bcc4ca4c9cb5d.tar.gz
git-0c47e8ddf5e6584fe8baf8d25b2bcc4ca4c9cb5d.tar.bz2
Merge branch 'po/doc-branch' into maint
Doc update. * po/doc-branch: doc branch: provide examples for listing remote tracking branches
Diffstat (limited to 'builtin')
-rw-r--r--builtin/branch.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index d4359b3..8e243cf 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -830,7 +830,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
strbuf_release(&buf);
} else if (argc > 0 && argc <= 2) {
if (filter.kind != FILTER_REFS_BRANCHES)
- die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
+ die(_("The -a, and -r, options to 'git branch' do not take a branch name.\n"
+ "Did you mean to use: -a|-r --list <pattern>?"));
if (track == BRANCH_TRACK_OVERRIDE)
die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead."));