diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2009-11-09 09:05:03 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-10 12:00:21 -0800 |
| commit | 0874f46e711393b61f6375ab9e2cd4a0c2b812e9 (patch) | |
| tree | 8212cfca3cf83009c710fa3c1daeeba4b473abb4 /builtin-merge-recursive.c | |
| parent | 64b1cb74f8312c0a43ce32f51097172efc69355a (diff) | |
| download | git-0874f46e711393b61f6375ab9e2cd4a0c2b812e9.tar.gz git-0874f46e711393b61f6375ab9e2cd4a0c2b812e9.tar.xz | |
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 <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-recursive.c')
| -rw-r--r-- | builtin-merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c index d26a96e48..710674c6b 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 <base>... -- <head> <remote> ...", argv[0]); + usagef("%s <base>... -- <head> <remote> ...", argv[0]); for (i = 1; i < argc; ++i) { if (!strcmp(argv[i], "--")) |