Merge branch 'sg/rebase-progress' into maint

diff --git a/builtin/branch.c b/builtin/branch.c
index d4359b33ac0fb27b6b8be7109a2a862bc9cd2d77..8e243cf8c2fe094ec332150761f7434287d6e96b 100644 (file)
--- 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."));