diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2009-11-09 09:04:45 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-09 17:08:45 -0800 |
| commit | 20c7e3d5cfcc0834fd5d38200e94d15a103ab271 (patch) | |
| tree | 9581a7806df7476271448389ce881f0bdcd66f9c /builtin-merge-ours.c | |
| parent | 6e9daeffec0213fa1cee76ad9d899fe492409f46 (diff) | |
| download | git-20c7e3d5cfcc0834fd5d38200e94d15a103ab271.tar.gz git-20c7e3d5cfcc0834fd5d38200e94d15a103ab271.tar.xz | |
Show usage string for 'git merge-ours -h'
This change is strictly about 'git merge-ours -h' without
any other options and arguments.
This change cannot break compatibility since merge drivers are
always passed '--', among other arguments.
Any usage string for this command is a lie, since it ignored its
arguments until now. Still, it makes sense to let the user know
the expected usage when asked.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
| -rw-r--r-- | builtin-merge-ours.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin-merge-ours.c b/builtin-merge-ours.c index 8f5bbaf40..684411694 100644 --- a/builtin-merge-ours.c +++ b/builtin-merge-ours.c @@ -10,6 +10,9 @@ #include "git-compat-util.h" #include "builtin.h" +static const char builtin_merge_ours_usage[] = + "git merge-ours <base>... -- HEAD <remote>..."; + static const char *diff_index_args[] = { "diff-index", "--quiet", "--cached", "HEAD", "--", NULL }; @@ -17,6 +20,9 @@ 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); + /* * We need to exit with 2 if the index does not match our HEAD tree, * because the current index is what we will be committing as the |