From: Jonathan Nieder Date: Mon, 9 Nov 2009 15:05:03 +0000 (-0600) Subject: merge-{recursive,subtree}: use usagef() to print usage X-Git-Tag: v1.6.6-rc0~34^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0874f46e711393b61f6375ab9e2cd4a0c2b812e9?ds=inline;hp=--cc merge-{recursive,subtree}: use usagef() to print usage Usage messages (for example, from "git merge-recursive -h") are friendlier when not preceded by "fatal". Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- 0874f46e711393b61f6375ab9e2cd4a0c2b812e9 diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c index d26a96e486..710674c6b2 100644 --- a/builtin-merge-recursive.c +++ b/builtin-merge-recursive.c @@ -33,7 +33,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix) } if (argc < 4) - die("Usage: %s ... -- ...", argv[0]); + usagef("%s ... -- ...", argv[0]); for (i = 1; i < argc; ++i) { if (!strcmp(argv[i], "--"))