>From 66f985b2510c870e62e313732de4b6709894b074 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Sun, 3 Mar 2013 12:19:57 -0800 Subject: [PATCH] describe: Better error message on --all --match The reason they conflict is that --all means (a) allow unannotated, and (b) allow refs of any name (rather than only tags), while --match contradicts (b) and goes further to (c) allow only tags matching pattern. If what the user wants is (a) and (c), they can use --tags to get (a) without (b). --- builtin/describe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/describe.c b/builtin/describe.c index 2ef3f10..6581c40 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -436,7 +436,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix) die(_("--long is incompatible with --abbrev=0")); if (pattern && all) - die(_("--match is incompatible with --all")); + die(_("--all conflicts with --match; do you mean --tags?")); if (contains) { const char **args = xmalloc((7 + argc) * sizeof(char *)); -- 1.7.11.3