mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/unbreak-am-h' into maint

Browse Source 
"git am -h" triggered a BUG().

* jk/unbreak-am-h:
  am: handle "-h" argument earlier
This commit is contained in:
Junio C Hamano 2017-06-05 09:03:15 +09:00
commit f72e075e30
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/am.c
View File

@ -2311,6 +2311,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)
OPT_END() OPT_END()
}; };
if (argc == 2 && !strcmp(argv[1], "-h"))
usage_with_options(usage, options);
git_config(git_am_config, NULL); git_config(git_am_config, NULL);
am_state_init(&state); am_state_init(&state);