projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 64b1cb7)
merge-{recursive,subtree}: use usagef() to print usage
authorJonathan Nieder <jrnieder@gmail.com>
Mon, 9 Nov 2009 15:05:03 +0000 (09:05 -0600)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Nov 2009 20:00:21 +0000 (12:00 -0800)
Usage messages (for example, from "git merge-recursive -h") are
friendlier when not preceded by "fatal".

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-merge-recursive.c patch | blob | history

diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index d26a96e486f2a84fdfc54527d15b9acdf7ea34bb..710674c6b2cccec4f1e0baa477a11d78cda72833 100644 (file)
--- 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 <base>... -- <head> <remote> ...", argv[0]);
+               usagef("%s <base>... -- <head> <remote> ...", argv[0]);
 
        for (i = 1; i < argc; ++i) {
                if (!strcmp(argv[i], "--"))
Git—the stupid content tracker