summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-07-09 15:25:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-07-09 15:25:34 -0700
commitecf55ae4f0f73a9759eb58e01cfcc6758acc07c2 (patch)
tree59eb2d0d7aaa401f8258e23ee4a5236108380fba /builtin
parentMerge branch 'nb/branch-show-other-worktrees-head' (diff)
parentdoc branch: provide examples for listing remote tracking branches (diff)
downloadtgif-ecf55ae4f0f73a9759eb58e01cfcc6758acc07c2.tar.xz
Merge branch 'po/doc-branch'
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 2cb45e42e1..2ef214632f 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -838,7 +838,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."));