diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-01 14:09:14 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-01 14:56:18 +0900 |
| commit | 60f32610243165e43afca785a85c38967130a70f (patch) | |
| tree | b32cebc3328c5e63aef5f573bd82569fb3c48caa /builtin/merge-ours.c | |
| parent | 29ec62700ad3db6be572c6f3c03a7d0443c86353 (diff) | |
| download | git-jc/wip-check-help-option.tar.gz | |
check_help_option(): a helper for early check of "-h" optionjc/wip-check-help-option
As "show help when we get '-h' as the only option." often appears,
let's give an easy helper to call for these call sites.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
| -rw-r--r-- | builtin/merge-ours.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index 684411694f..52be2fa2f4 100644 --- a/builtin/merge-ours.c +++ b/builtin/merge-ours.c @@ -20,8 +20,7 @@ static const char *diff_index_args[] = { int cmd_merge_ours(int argc, const char **argv, const char *prefix) { - if (argc == 2 && !strcmp(argv[1], "-h")) - usage(builtin_merge_ours_usage); + check_help_option(argc, argv, builtin_merge_ours_usage, NULL); /* * We need to exit with 2 if the index does not match our HEAD tree, |