diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-13 05:49:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-13 05:49:50 (GMT) |
| commit | 6758af89e4bf3f767e189da3e09c3c939162872d (patch) | |
| tree | d0f25a4cd8c831949748fe9334aaad595e225cd1 /builtin/branch.c | |
| parent | 4443091d961e91041e64c1675940f0585eeba456 (diff) | |
| parent | 9c7c27eeab73b4c90cf36c6aa06ba6b8b9777629 (diff) | |
| download | git-6758af89e4bf3f767e189da3e09c3c939162872d.zip git-6758af89e4bf3f767e189da3e09c3c939162872d.tar.gz git-6758af89e4bf3f767e189da3e09c3c939162872d.tar.bz2 | |
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/branch.c')
| -rw-r--r-- | builtin/branch.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 807355a..0cad20b 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -668,6 +668,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix) OPT_END(), }; + if (argc == 2 && !strcmp(argv[1], "-h")) + usage_with_options(builtin_branch_usage, options); + git_config(git_branch_config, NULL); if (branch_use_color == -1) |