diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:50 -0800 |
| commit | 6758af89e4bf3f767e189da3e09c3c939162872d (patch) | |
| tree | d0f25a4cd8c831949748fe9334aaad595e225cd1 /builtin/merge.c | |
| parent | 4443091d961e91041e64c1675940f0585eeba456 (diff) | |
| parent | 9c7c27eeab73b4c90cf36c6aa06ba6b8b9777629 (diff) | |
| download | git-6758af89e4bf3f767e189da3e09c3c939162872d.tar.gz | |
Merge branch 'jn/git-cmd-h-bypass-setup'
* jn/git-cmd-h-bypass-setup:
update-index -h: show usage even with corrupt index
merge -h: show usage even with corrupt index
ls-files -h: show usage even with corrupt index
gc -h: show usage even with broken configuration
commit/status -h: show usage even with broken configuration
checkout-index -h: show usage even in an invalid repository
branch -h: show usage even in an invalid repository
Conflicts:
builtin/merge.c
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 3921cd3040..42fff387e6 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -922,6 +922,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix) const char *best_strategy = NULL, *wt_strategy = NULL; struct commit_list **remotes = &remoteheads; + if (argc == 2 && !strcmp(argv[1], "-h")) + usage_with_options(builtin_merge_usage, builtin_merge_options); + /* * Check if we are _not_ on a detached HEAD, i.e. if there is a * current branch. |