diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-04 09:55:44 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-04 09:55:44 +0900 |
| commit | fe3bf4cb526aa85941c30b6e9104e8b0a84094c3 (patch) | |
| tree | 6025b0dac28226709c9685910b8fcbdb3b5cfbcc | |
| parent | 9af970339e1055313ca19f9f28d006ed621b0080 (diff) | |
| parent | f3a2fffe06d13b216cbc18acba5a46b8a00ae326 (diff) | |
| download | git-fe3bf4cb526aa85941c30b6e9104e8b0a84094c3.tar.gz git-fe3bf4cb526aa85941c30b6e9104e8b0a84094c3.tar.xz | |
Merge branch 'jk/unbreak-am-h'
"git am -h" triggered a BUG().
* jk/unbreak-am-h:
am: handle "-h" argument earlier
| -rw-r--r-- | builtin/am.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/am.c b/builtin/am.c index 0f63dcab1..5ee146bfb 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2311,6 +2311,9 @@ int cmd_am(int argc, const char **argv, const char *prefix) OPT_END() }; + if (argc == 2 && !strcmp(argv[1], "-h")) + usage_with_options(usage, options); + git_config(git_am_config, NULL); am_state_init(&state); |